Commit e9524ead authored by OTB Bot's avatar OTB Bot

Modifs sur l'option JPEG2000.

parent 1653635d
......@@ -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}")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment