diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d6dc9da7c80fe60bc7545d1d8140c42d09c3d79..1c5b1c456bb71eb6dc4e0a2d3e7e34c8eeb3406f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,6 +96,7 @@ ENDIF(OTB_USE_EXTERNAL_ITK) # JPEG2000 specification control +SET(OTB_COMPILE_JPEG2000 0) IF( OTB_USE_JPEG2000 ) SET(OTB_COMPILE_JPEG2000 1) IF(OTB_USE_EXTERNAL_ITK) @@ -126,8 +127,6 @@ ENDIF(OTB_COMPILE_JPEG2000) - - #----------------------------------------------------------------------------- # Option for generate Visu tools !!! OPTION(OTB_USE_VISU_GUI "Generate Gui/Visu tools directory. If ON, find OpenGL and FLTK packages." ON) @@ -503,15 +502,10 @@ ENDIF(OTB_USE_VISU_GUI) # => Create OTB_ALGO_UTILITIES_DEPENDENT_LIBRARIES SET(OTB_ALGO_UTILITIES_DEPENDENT_LIBRARIES "otb6S otbgalib InsightJournal otbsvm") -IF(NOT OTB_USE_EXTERNAL_ITK) -# Case for release 2.2.1 -# SET(OTB_UTILITIES_DEPENDENT_LIBRARIES "${OTB_UTILITIES_DEPENDENT_LIBRARIES}") - IF(OTB_USE_JPEG2000) +# => Create OTB_UTILITIES_DEPENDENT_LIBRARIES +IF( OTB_COMPILE_JPEG2000 ) SET(OTB_UTILITIES_DEPENDENT_LIBRARIES "${OTB_UTILITIES_DEPENDENT_LIBRARIES} otbopenjpeg") - ELSE(OTB_USE_JPEG2000) - SET(OTB_UTILITIES_DEPENDENT_LIBRARIES "${OTB_UTILITIES_DEPENDENT_LIBRARIES} ") - ENDIF(OTB_USE_JPEG2000) -ENDIF(NOT OTB_USE_EXTERNAL_ITK) +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}")