Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Main Repositories
otb
Commits
363f3207
Commit
363f3207
authored
Jan 22, 2008
by
Thomas Feuvrier
Browse files
Suite mise a jour pour FLTK en interne.
parent
92e9e55e
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
363f3207
...
...
@@ -202,21 +202,33 @@ IF(OTB_USE_VISU_GUI)
SET
(
FLTK_PLATFORM_DEPENDENT_LIBS ole32 uuid wsock32 gdi32 comdlg32
)
ENDIF
(
MINGW
)
#----------------------------------------------------------------
# RESUME Alls VISU GUI libraries use by OTB in a single VARIABLE
# SET(OTB_VISU_GUI_LIBRARIES "${FLTK_LIBRARIES} ${OTB_VISU_GUI_LIBRARIES}")
# SET(OTB_FLTK_FLUID_EXECUTABLE "${FLTK_FLUID_EXECUTABLE}")
# SET(OTB_VISU_GUI_LIBRARIES "${FLTK_LIBRARIES};${OPENGL_LIBRARIES} ")
ELSE
(
OTB_USE_EXTERNAL_FLTK
)
SET
(
FLTK_PLATFORM_DEPENDENT_LIBS
""
)
IF
(
EXISTS
"
${
OTB_BINARY_DIR
}
/Utilities/FLTK/FLTKConfig.cmake"
)
INCLUDE
(
${
OTB_BINARY_DIR
}
/Utilities/FLTK/FLTKConfig.cmake
)
ENDIF
(
EXISTS
"
${
OTB_BINARY_DIR
}
/Utilities/FLTK/FLTKConfig.cmake"
)
#----------------------------------------------------------------
# RESUME Alls VISU GUI libraries use by OTB in a single VARIABLE
SET
(
OTB_VISU_GUI_LIBRARIES
"
${
FLTK_LIBRARIES
}
;
${
OPENGL_LIBRARIES
}
"
)
ENDIF
(
OTB_USE_EXTERNAL_FLTK
)
#----------------------------------------------------------------
# ADD Specifics mingw lib
# IF(MINGW)
# SET(OTB_VISU_GUI_LIBRARIES "${OTB_VISU_GUI_LIBRARIES};ole32;uuid;wsock32;gdi32;comdlg32;shell32") # wininet dsound gdi32 vfw32
# ENDIF(MINGW)
ENDIF
(
OTB_USE_VISU_GUI
)
# MESSAGE("FLUID_COMMAND -> ${FLUID_COMMAND}")
# MESSAGE("FLTK_BINARY_DIR -> ${FLTK_BINARY_DIR}")
# MESSAGE("FLTK_USE_FILE -> ${FLTK_USE_FILE}")
# MESSAGE("FLTK_INCLUDE_DIRS -> ${FLTK_INCLUDE_DIRS}")
# MESSAGE("FLTK_LIBRARY_DIRS -> ${FLTK_LIBRARY_DIRS}")
# MESSAGE("FLTK_LIBRARIES -> ${FLTK_LIBRARIES}")
# MESSAGE("FLTK_DIR -> ${FLTK_DIR}")
# MESSAGE("FLTK_FLUID_COMMAND -> ${FLTK_FLUID_COMMAND}")
# MESSAGE("FLTK_EXECUTABLE_DIRS -> ${FLTK_EXECUTABLE_DIRS}")
# MESSAGE("OTB_VISU_GUI_LIBRARIES -> ${OTB_VISU_GUI_LIBRARIES}")
#-------------------------------
# End connections whith external libraries
...
...
OTBConfig.cmake.in
View file @
363f3207
...
...
@@ -78,5 +78,5 @@ SET(FLTK_PLATFORM_DEPENDENT_LIBS "@FLTK_PLATFORM_DEPENDENT_LIBS@")
# The OTB Visu Gui informations
SET(OTB_USE_VISU_GUI "@OTB_USE_VISU_GUI@")
SET(OTB_VISU_GUI_LIBRARIES "@
FLTK_LIBRARIES@;@OPENGL_LIBRARIES@;@FLTK_PLATFORM_DEPENDENT_LIB
S@")
SET(OTB_VISU_GUI_LIBRARIES "@
OTB_VISU_GUI_LIBRARIE
S@")
otbIncludeDirectories.cmake
View file @
363f3207
...
...
@@ -80,7 +80,7 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX} )
#-----------------------------------------------------------------------------
# Include FLTK variables.
#IF(OTB_USE_EXTERNAL_FLTK)
#IF(
NOT
OTB_USE_EXTERNAL_FLTK)
# IF(NOT EXISTS "${FLTK_BINARY_DIR}/FLTKConfig.cmake")
# MESSAGE(FATAL_ERROR "Impossible to find the file ${FLTK_BINARY_DIR}/FLTKConfig.cmake. You must generate FLTK with cmake process.")
# ELSE(NOT EXISTS "${FLTK_BINARY_DIR}/FLTKConfig.cmake")
...
...
@@ -90,7 +90,8 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX} )
# IF(EXISTS "${OTB_BINARY_DIR}/Utilities/FLTK/FLTKConfig.cmake")
# INCLUDE(${OTB_BINARY_DIR}/Utilities/FLTK/FLTKConfig.cmake)
# ENDIF(EXISTS "${OTB_BINARY_DIR}/Utilities/FLTK/FLTKConfig.cmake")
#ENDIF(OTB_USE_EXTERNAL_FLTK)
#ENDIF(NOT OTB_USE_EXTERNAL_FLTK)
#-----------------------------------------------------------------------------
# Include directories from the FLTK build tree.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment