Suite mise a jour pour FLTK en interne.

CMakeLists.txt

@@ -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

@@ -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_LIBS@")
+SET(OTB_VISU_GUI_LIBRARIES "@OTB_VISU_GUI_LIBRARIES@")
 

otbIncludeDirectories.cmake

@@ -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.