Commit 6fc22610 authored by Cyrille Valladeau's avatar Cyrille Valladeau
Browse files

Chagt du nom d'option : OTB_USE_OPENJPEG -> OTB_USE_JPEG2000

parent 7334c78a
......@@ -71,10 +71,12 @@ OPTION(BUILD_TESTING "Build testing." OFF)
# Case for release 2.2.1
# Use the openjpeg library.
OPTION(OTB_USE_OPENJPEG "Use the openjpeg library." OFF)
MARK_AS_ADVANCED(OTB_USE_OPENJPEG)
# Add compiler option
ADD_DEFINITIONS(-DOTB_USE_OPENJPEG)
OPTION(OTB_USE_JPEG2000 "Use to support jpeg2000 image file format." OFF)
MARK_AS_ADVANCED(OTB_USE_JPEG2000)
# Add compiler option
IF(OTB_USE_JPEG2000)
ADD_DEFINITIONS(-DOTB_USE_JPEG2000)
ENDIF(OTB_USE_JPEG2000)
#-----------------------------------------------------------------------------
......@@ -476,11 +478,11 @@ 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_OPENJPEG)
IF(OTB_USE_JPEG2000)
SET(OTB_UTILITIES_DEPENDENT_LIBRARIES "${OTB_UTILITIES_DEPENDENT_LIBRARIES} otbopenjpeg")
ELSE(OTB_USE_OPENJPEG)
ELSE(OTB_USE_JPEG2000)
SET(OTB_UTILITIES_DEPENDENT_LIBRARIES "${OTB_UTILITIES_DEPENDENT_LIBRARIES} ")
ENDIF(OTB_USE_OPENJPEG)
ENDIF(OTB_USE_JPEG2000)
ENDIF(NOT OTB_USE_EXTERNAL_ITK)
# => Create OTB_ALLS_UTILITIES_DEPENDENT_LIBRARIES
......
......@@ -4,11 +4,11 @@ FILE(GLOB OTBIO_SRCS "*.cxx" )
# Case for release 2.2.1
IF(OTB_USE_EXTERNAL_ITK)
IF(NOT OTB_USE_OPENJPEG)
IF(NOT OTB_USE_JPEG2000)
LIST(REMOVE_ITEM OTBIO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbJPEG2000ImageIO.cxx" )
LIST(REMOVE_ITEM OTBIO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbJPEG2000ImageIOFactory.cxx" )
ADD_DEFINITIONS(-DOTB_JPEG2000_DISABLED)
ENDIF(NOT OTB_USE_OPENJPEG)
ENDIF(NOT OTB_USE_JPEG2000)
ENDIF(OTB_USE_EXTERNAL_ITK)
IF( NOT OTB_USE_CURL )
......@@ -19,13 +19,13 @@ ENDIF( NOT OTB_USE_CURL )
# Case for release 2.2.1
# otbopenjpeg
IF(OTB_USE_OPENJPEG)
IF(OTB_USE_JPEG2000)
IF(OTB_BUILD_SHARED_LIBS)
ADD_DEFINITIONS(-DOPJ_EXPORTS)
ELSE(OTB_BUILD_SHARED_LIBS)
ADD_DEFINITIONS(-DOPJ_STATIC)
ENDIF(OTB_BUILD_SHARED_LIBS)
ENDIF(OTB_USE_OPENJPEG)
ENDIF(OTB_USE_JPEG2000)
ADD_LIBRARY(OTBIO ${OTBIO_SRCS})
......@@ -36,11 +36,11 @@ ELSE(OTB_USE_EXTERNAL_ITK)
# Case for release 2.2.1
## TARGET_LINK_LIBRARIES (OTBIO gdal OTBCommon ITKIO ITKCommon otbossim dxf otbopenjpeg)
#TARGET_LINK_LIBRARIES (OTBIO gdal OTBCommon ITKIO ITKCommon otbossim dxf)
IF(OTB_USE_OPENJPEG)
IF(OTB_USE_JPEG2000)
TARGET_LINK_LIBRARIES (OTBIO gdal OTBCommon ITKIO ITKCommon otbossim dxf otbopenjpeg)
ELSE(OTB_USE_OPENJPEG)
ELSE(OTB_USE_JPEG2000)
TARGET_LINK_LIBRARIES (OTBIO gdal OTBCommon ITKIO ITKCommon otbossim dxf)
ENDIF(OTB_USE_OPENJPEG)
ENDIF(OTB_USE_JPEG2000)
ENDIF(OTB_USE_EXTERNAL_ITK)
IF( OTB_USE_CURL )
......@@ -63,10 +63,10 @@ ENDIF( NOT OTB_USE_CURL )
# Case for release 2.2.1
IF(OTB_USE_EXTERNAL_ITK)
IF(OTB_USE_OPENJPEG)
IF(OTB_USE_JPEG2000)
LIST(REMOVE_ITEM __files1 "${CMAKE_CURRENT_SOURCE_DIR}/otbJpeg2000ImageIOFactory.h" )
LIST(REMOVE_ITEM __files1 "${CMAKE_CURRENT_SOURCE_DIR}/otbJpeg2000ImageIO.h" )
ENDIF(OTB_USE_OPENJPEG)
ENDIF(OTB_USE_JPEG2000)
ENDIF(OTB_USE_EXTERNAL_ITK)
......
......@@ -1271,7 +1271,7 @@ ADD_TEST(ioTvossimElevManagerTest ${IO_TESTS12}
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Case for release 2.2.1
IF(OTB_USE_OPENJPEG)
IF(OTB_USE_JPEG2000)
IF(NOT OTB_USE_EXTERNAL_ITK)
# --- JPEG2000 can read ---
......@@ -1327,7 +1327,7 @@ ADD_TEST(ioTuJPEG2000ImageIOCanWrite ${IO_TESTS13}
${INPUTDATA}/toto.j2k
)
ENDIF(NOT OTB_USE_EXTERNAL_ITK)
ENDIF(OTB_USE_OPENJPEG)
ENDIF(OTB_USE_JPEG2000)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbIOTESTS14 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......@@ -1495,20 +1495,20 @@ otbOssimElevManagerTest.cxx
)
IF(OTB_USE_OPENJPEG)
IF(OTB_USE_JPEG2000)
SET(BasicIO_SRCS13
otbJPEG2000ImageIOTestCanRead.cxx
otbJPEG2000ImageIOTestCanWrite.cxx
)
ENDIF(OTB_USE_OPENJPEG)
ENDIF(OTB_USE_JPEG2000)
# Case for release 2.2.1
IF(OTB_USE_OPENJPEG)
IF(OTB_USE_JPEG2000)
IF(OTB_USE_EXTERNAL_ITK)
LIST(REMOVE_ITEM BasicIO_SRCS13 "${CMAKE_CURRENT_SOURCE_DIR}/otbJPEG2000ImageIOTestCanRead.cxx" )
LIST(REMOVE_ITEM BasicIO_SRCS13 "${CMAKE_CURRENT_SOURCE_DIR}/otbJPEG2000ImageIOTestCanWrite.cxx" )
ENDIF(OTB_USE_EXTERNAL_ITK)
ENDIF(OTB_USE_OPENJPEG)
ENDIF(OTB_USE_JPEG2000)
SET(BasicIO_SRCS14
otbOGRDriverTest.cxx
......
......@@ -28,8 +28,8 @@
void RegisterTests()
{
//# Case for release 2.2.0
if(OTB_USE_OPENJPEG)
//# Case for release 2.2.1
if(OTB_USE_JPEG2000)
{
REGISTER_TEST(otbJPEG2000ImageIOTestCanRead);
REGISTER_TEST(otbJPEG2000ImageIOTestCanWrite);
......
$
IF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING )
SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images)
......@@ -416,20 +416,20 @@ itkScaleInvariantFeatureImageFilterTest.cxx
)
# Case for release 2.2.1
IF(OTB_USE_OPENJPEG)
IF(OTB_USE_JPEG2000)
SET(UtilitiesTests_SRCS ${UtilitiesTests_SRCS} openJpegEncoder.cxx openJpegDecoder.cxx)
ENDIF(OTB_USE_OPENJPEG)
ENDIF(OTB_USE_JPEG2000)
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}")
ADD_EXECUTABLE(otbUtilitiesTests otbUtilitiesTests.cxx ${UtilitiesTests_SRCS})
IF(OTB_USE_OPENJPEG)
IF(OTB_USE_JPEG2000)
TARGET_LINK_LIBRARIES(otbUtilitiesTests OTBIO OTBCommon gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon otbossim otbsvm otb6S tinyXML openjpeg)
ELSE(OTB_USE_OPENJPEG)
ELSE(OTB_USE_JPEG2000)
TARGET_LINK_LIBRARIES(otbUtilitiesTests OTBIO OTBCommon gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon otbossim otbsvm otb6S tinyXML )
ENDIF(OTB_USE_OPENJPEG)
ENDIF(OTB_USE_JPEG2000)
IF(UNIX)
TARGET_LINK_LIBRARIES (otbUtilitiesTests m)
ENDIF(UNIX)
......
......@@ -4,9 +4,9 @@
IF(NOT OTB_USE_EXTERNAL_ITK)
SUBDIRS(ITK)
# Case for release 2.2.1
IF(NOT OTB_USE_OPENJPEG)
IF(NOT OTB_USE_JPEG2000)
SUBDIRS( ITK otbopenjpeg)
ENDIF(NOT OTB_USE_OPENJPEG)
ENDIF(NOT OTB_USE_JPEG2000)
ENDIF(NOT OTB_USE_EXTERNAL_ITK)
IF(OTB_USE_VISU_GUI)
......
......@@ -25,10 +25,10 @@ SET(OPJ_PREFIX "itk")
# In static, pb of linking between itkopenjpeg and otbopenjeg (method definided twice)
# Case for release 2.2.1
#-----------------------------
IF(NOT OTB_USE_OPENJPEG)
IF(NOT OTB_USE_JPEG2000)
ITK_THIRD_PARTY_SUBDIR(OpenJPEG openjpeg)
ITK_THIRD_PARTY_SUBDIR(GDCM gdcm)
ENDIF(NOT OTB_USE_OPENJPEG)
ENDIF(NOT OTB_USE_JPEG2000)
#------------------------------------------------------------------------------
......
......@@ -43,9 +43,9 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
# ${OTB_SOURCE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3/contrib
)
# Case for release 2.2.1
IF(OTB_USE_OPENJPEG)
IF(OTB_USE_JPEG2000)
SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE} ${OTB_SOURCE_DIR}/Utilities/otbopenjpeg/libopenjpeg)
ENDIF(OTB_USE_OPENJPEG)
ENDIF(OTB_USE_JPEG2000)
#-----------------------------------------------------------------------------
# Include directories from the ossim build tree
......@@ -195,10 +195,10 @@ SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
# ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3/contrib
)
# Case for release 2.2.0
IF(OTB_USE_OPENJPEG)
# Case for release 2.2.1
IF(OTB_USE_JPEG2000)
SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE} ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenjpeg/libopenjpeg)
ENDIF(OTB_USE_OPENJPEG)
ENDIF(OTB_USE_JPEG2000)
#For GDAL header file
SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
......
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