diff --git a/CMakeLists.txt b/CMakeLists.txt index 73ded065b3cceb3173877684368fbf2cd3547482..eaa18f74a4114991a68a6a002e64e8c662d9ed77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,7 +100,6 @@ ENDIF (NOT GDAL_INCLUDE_DIRS) INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIRS}) - LINK_DIRECTORIES( ${GDAL_LIBRARY_DIRS} ) #----------------------------------------------------------------------------- @@ -141,49 +140,17 @@ IF(OTB_USE_VISU_GUI) #---------------------------------------------------------------- # RESUME Alls VISU GUI libraries use by OTB in a single VARIABLE - SET(OTB_VISU_GUI_LIBRARIES "${FLTK_LIBRARIES} ${OPENGL_LIBRARIES} ") + SET(OTB_VISU_GUI_LIBRARIES "${FLTK_LIBRARIES};${OPENGL_LIBRARIES} ") + #---------------------------------------------------------------- + # 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) ELSE(OTB_USE_VISU_GUI) SET(OTB_VISU_GUI_LIBRARIES "") ENDIF(OTB_USE_VISU_GUI) -#----------------------------------------------------------------------------- -# Analyse FLTK PLATFORM DEPENDENT LIBS !!! -# This part of CMake code source is extract about the FLTK CMakeLists.txt -# IF(UNIX) -# FIND_PACKAGE(X11) -# SET( OTB_FLTK_PLATFORM_DEPENDENT_LIBS ${X11_LIBRARIES} -lm) -# ENDIF(UNIX) - -# IF(APPLE AND NOT FLTK_APPLE_X11) -# SET( OTB_FLTK_PLATFORM_DEPENDENT_LIBS -# "-framework Carbon -framework Cocoa -framework ApplicationServices -lz") -# ENDIF(APPLE AND NOT FLTK_APPLE_X11) - -# IF(WIN32) -# IF(NOT CYGWIN) -# IF(BORLAND) -# SET( OTB_FLTK_PLATFORM_DEPENDENT_LIBS import32 ) -# ELSE(BORLAND) -# SET( OTB_FLTK_PLATFORM_DEPENDENT_LIBS wsock32 comctl32 ) -# ENDIF(BORLAND) -# ENDIF(NOT CYGWIN) -# ENDIF(WIN32) - -# IF(CYGWIN) -# ADD_DEFINITIONS(-DWIN32) -# SET( OTB_FLTK_PLATFORM_DEPENDENT_LIBS ole32 uuid comctl32 wsock32 supc++ -lm -lgdi32) -# ENDIF(CYGWIN) - -# IF(MINGW) -# ADD_DEFINITIONS(-DWIN32) -# SET( OTB_FLTK_PLATFORM_DEPENDENT_LIBS ole32 uuid wsock32 gdi32 comdlg32) -# ENDIF(MINGW) - - -MESSAGE("FLTK_LIBRARIES -> ${FLTK_LIBRARIES}") -MESSAGE("OPENGL_LIBRARIES -> ${OPENGL_LIBRARIES}") -MESSAGE("OTB_VISU_GUI_LIBRARIES -> ${OTB_VISU_GUI_LIBRARIES}") #------------------------------- diff --git a/Testing/Code/Visu/CMakeLists.txt b/Testing/Code/Visu/CMakeLists.txt index bbaf842b6c3f7658b0f3b646ad331dcb68c81c76..ef58612319b031332575b0b0f453f642749f1825 100755 --- a/Testing/Code/Visu/CMakeLists.txt +++ b/Testing/Code/Visu/CMakeLists.txt @@ -157,7 +157,7 @@ otbAlternateViewerTest.cxx INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}") ADD_EXECUTABLE(otbVisuTests1 otbVisuTests1.cxx ${BasicVisu_SRCS1}) -TARGET_LINK_LIBRARIES(otbVisuTests1 OTBVisu OTBGui OTBIO gdal ITKIO ITKCommon) +TARGET_LINK_LIBRARIES(otbVisuTests1 OTBVisu OTBGui OTBIO gdal ITKIO ITKCommon ${OTB_VISU_GUI_LIBRARIES} ) ADD_EXECUTABLE(otbVisuTests2 otbVisuTests2.cxx ${BasicVisu_SRCS2}) TARGET_LINK_LIBRARIES(otbVisuTests2 OTBVisu OTBGui OTBIO gdal ITKIO ITKCommon)