diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e77a4a85b40e72a5c153e943d65681086117d7a..574c52a3877bb534392554b1c5b5a5bd9418315e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -521,28 +521,34 @@ ENDIF(OTB_USE_VISU_GUI) # => Create OTB_IO_UTILITIES_DEPENDENT_LIBRARIES #SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "gdal dxf otbkml tinyXML otbgeotiff otbxtiff otbossim otbossimBase otbossimElevation otbossimFont otbossimKBool otbossimMatrix otbossimPlugin otbossimProjectionImaging otbossimSupportData otbossimVec otbossimVpfUtil") -SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "gdal dxf tinyXML otbgeotiff otbxtiff otbossim otbossimBase otbossimElevation otbossimFont otbossimKBool otbossimMatrix otbossimPlugin otbossimProjectionImaging otbossimSupportData otbossimVec otbossimVpfUtil") +SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "gdal;dxf;tinyXML;otbgeotiff;otbxtiff;otbossim" ) +#otbossimBase otbossimElevation otbossimFont otbossimKBool otbossimMatrix otbossimPlugin otbossimProjectionImaging otbossimSupportData otbossimVec otbossimVpfUtil") + +IF(NOT OTB_USE_EXTERNAL_OPENTHREADS) + SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES};${OPENTHREADS_LIBRARY}") +ENDIF(NOT OTB_USE_EXTERNAL_OPENTHREADS) # Add EXPAT library IF( OTB_USE_EXTERNAL_EXPAT ) - SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES} expat") + SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES};expat") ELSE( OTB_USE_EXTERNAL_EXPAT ) - SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES} otbexpat") + SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES};otbexpat") ENDIF( OTB_USE_EXTERNAL_EXPAT ) +# Add Open Jpeg library +IF( OTB_COMPILE_JPEG2000 ) + SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES};otbopenjpeg") +ENDIF( OTB_COMPILE_JPEG2000 ) + # Add VISU libraries -IF(OTB_USE_VISU_GUI) - SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES} ${OTB_VISU_GUI_LIBRARIES}") -ENDIF(OTB_USE_VISU_GUI) +#IF(OTB_USE_VISU_GUI) +# SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES} ${OTB_VISU_GUI_LIBRARIES}") +#ENDIF(OTB_USE_VISU_GUI) # => Create OTB_ALGO_UTILITIES_DEPENDENT_LIBRARIES -SET(OTB_ALGO_UTILITIES_DEPENDENT_LIBRARIES "otb6S otbgalib InsightJournal otbsvm") +SET(OTB_ALGO_UTILITIES_DEPENDENT_LIBRARIES "otb6S;otbgalib;InsightJournal;otbsvm") -# => Create OTB_UTILITIES_DEPENDENT_LIBRARIES -IF( OTB_COMPILE_JPEG2000 ) - SET(OTB_UTILITIES_DEPENDENT_LIBRARIES "${OTB_UTILITIES_DEPENDENT_LIBRARIES} otbopenjpeg") -ENDIF( OTB_COMPILE_JPEG2000 ) # => Create OTB_ALLS_UTILITIES_DEPENDENT_LIBRARIES SET(OTB_ALLS_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES} ${OTB_ALGO_UTILITIES_DEPENDENT_LIBRARIES}") diff --git a/OTBConfig.cmake.in b/OTBConfig.cmake.in index b1468d3df6328b5ddd660912efac90e4bbab5bda..01e4cfba6f553e6c102d959d49f663a05111dd1a 100644 --- a/OTBConfig.cmake.in +++ b/OTBConfig.cmake.in @@ -87,6 +87,9 @@ SET(FLTK_PLATFORM_DEPENDENT_LIBS "@FLTK_PLATFORM_DEPENDENT_LIBS@") SET(OTB_USE_VISU_GUI "@OTB_USE_VISU_GUI@") SET(OTB_VISU_GUI_LIBRARIES "@OTB_VISU_GUI_LIBRARIES@") +# The list of OTB/Utilities IO libraries +SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "@OTB_IO_UTILITIES_DEPENDENT_LIBRARIES@") + # The FLTK version number #SET(FLTK_VERSION_MAJOR "@FLTK_VERSION_MAJOR@") #SET(FLTK_VERSION_MINOR "@FLTK_VERSION_MINOR@")