From c334f7d7c85a8621556a44d547b0a2dab5b411c9 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@c-s.fr>
Date: Mon, 19 May 2008 09:39:37 +0000
Subject: [PATCH] mise en commentaire de openjpeg
---
CMakeLists.txt | 4 +-
Code/IO/CMakeLists.txt | 36 ++---
Code/IO/otbImageIOFactory.cxx | 16 ++-
Testing/Code/BasicFilters/CMakeLists.txt | 16 +--
Testing/Code/ChangeDetection/CMakeLists.txt | 4 +-
Testing/Code/Common/CMakeLists.txt | 14 +-
Testing/Code/DisparityMap/CMakeLists.txt | 6 +-
Testing/Code/FeatureExtraction/CMakeLists.txt | 18 +--
Testing/Code/Fusion/CMakeLists.txt | 4 +-
Testing/Code/Gui/CMakeLists.txt | 2 +-
Testing/Code/IO/CMakeLists.txt | 126 +++++++++---------
Testing/Code/IO/otbIOTests13.cxx | 5 +-
Testing/Code/Learning/CMakeLists.txt | 6 +-
Testing/Code/Markov/CMakeLists.txt | 4 +-
Testing/Code/MultiScale/CMakeLists.txt | 6 +-
Testing/Code/Projections/CMakeLists.txt | 6 +-
Testing/Code/Radiometry/CMakeLists.txt | 8 +-
Testing/Code/SpatialReasoning/CMakeLists.txt | 4 +-
Testing/Code/Visu/CMakeLists.txt | 4 +-
Testing/Fa/CMakeLists.txt | 6 +-
Testing/Utilities/CMakeLists.txt | 2 +-
Utilities/CMakeLists.txt | 5 +-
otbIncludeDirectories.cmake | 6 +-
23 files changed, 163 insertions(+), 145 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf399507b7..9cfed3ecf5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -448,7 +448,9 @@ ENDIF(OTB_USE_VISU_GUI)
SET(OTB_ALGO_UTILITIES_DEPENDENT_LIBRARIES "otb6S otbgalib InsightJournal otbsvm")
IF(NOT OTB_USE_EXTERNAL_ITK)
- SET(OTB_UTILITIES_DEPENDENT_LIBRARIES "${OTB_UTILITIES_DEPENDENT_LIBRARIES} otbopenjpeg")
+# Commented for release 2.2.0
+# SET(OTB_UTILITIES_DEPENDENT_LIBRARIES "${OTB_UTILITIES_DEPENDENT_LIBRARIES} otbopenjpeg")
+SET(OTB_UTILITIES_DEPENDENT_LIBRARIES "${OTB_UTILITIES_DEPENDENT_LIBRARIES}")
ENDIF(NOT OTB_USE_EXTERNAL_ITK)
# => Create OTB_ALLS_UTILITIES_DEPENDENT_LIBRARIES
diff --git a/Code/IO/CMakeLists.txt b/Code/IO/CMakeLists.txt
index faac6628fb..9d60ea08e8 100755
--- a/Code/IO/CMakeLists.txt
+++ b/Code/IO/CMakeLists.txt
@@ -2,30 +2,35 @@
FILE(GLOB OTBIO_SRCS "*.cxx" )
-IF(OTB_USE_EXTERNAL_ITK)
-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(OTB_USE_EXTERNAL_ITK)
+# Commented for release 2.2.0
+#IF(OTB_USE_EXTERNAL_ITK)
+#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(OTB_USE_EXTERNAL_ITK)
IF( NOT OTB_USE_CURL )
LIST(REMOVE_ITEM OTBIO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbTileMapImageIOFactory.cxx" )
LIST(REMOVE_ITEM OTBIO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbTileMapImageIO.cxx" )
ENDIF( NOT OTB_USE_CURL )
+
+# Commented for release 2.2.0
# otbopenjpeg
-IF(OTB_BUILD_SHARED_LIBS)
- ADD_DEFINITIONS(-DOPJ_EXPORTS)
-ELSE(OTB_BUILD_SHARED_LIBS)
- ADD_DEFINITIONS(-DOPJ_STATIC)
-ENDIF(OTB_BUILD_SHARED_LIBS)
+#IF(OTB_BUILD_SHARED_LIBS)
+# ADD_DEFINITIONS(-DOPJ_EXPORTS)
+#ELSE(OTB_BUILD_SHARED_LIBS)
+# ADD_DEFINITIONS(-DOPJ_STATIC)
+#ENDIF(OTB_BUILD_SHARED_LIBS)
ADD_LIBRARY(OTBIO ${OTBIO_SRCS})
#PROVISOIRE
IF(OTB_USE_EXTERNAL_ITK)
TARGET_LINK_LIBRARIES (OTBIO gdal OTBCommon ITKIO ITKCommon otbossim dxf )
ELSE(OTB_USE_EXTERNAL_ITK)
-TARGET_LINK_LIBRARIES (OTBIO gdal OTBCommon ITKIO ITKCommon otbossim dxf otbopenjpeg)
+# Commented for release 2.2.0
+# TARGET_LINK_LIBRARIES (OTBIO gdal OTBCommon ITKIO ITKCommon otbossim dxf otbopenjpeg)
+TARGET_LINK_LIBRARIES (OTBIO gdal OTBCommon ITKIO ITKCommon otbossim dxf)
ENDIF(OTB_USE_EXTERNAL_ITK)
IF( OTB_USE_CURL )
@@ -45,10 +50,11 @@ IF( NOT OTB_USE_CURL )
LIST(REMOVE_ITEM __files1 "${CMAKE_CURRENT_SOURCE_DIR}/otbTileMapImageIO.h" )
ENDIF( NOT OTB_USE_CURL )
-IF(OTB_USE_EXTERNAL_ITK)
- LIST(REMOVE_ITEM __files1 "${CMAKE_CURRENT_SOURCE_DIR}/otbJpeg2000ImageIOFactory.h" )
- LIST(REMOVE_ITEM __files1 "${CMAKE_CURRENT_SOURCE_DIR}/otbJpeg2000ImageIO.h" )
-ENDIF(OTB_USE_EXTERNAL_ITK)
+# Commented for release 2.2.0
+#IF(OTB_USE_EXTERNAL_ITK)
+# LIST(REMOVE_ITEM __files1 "${CMAKE_CURRENT_SOURCE_DIR}/otbJpeg2000ImageIOFactory.h" )
+# LIST(REMOVE_ITEM __files1 "${CMAKE_CURRENT_SOURCE_DIR}/otbJpeg2000ImageIO.h" )
+#ENDIF(OTB_USE_EXTERNAL_ITK)
INSTALL(FILES ${__files1} ${__files2}
diff --git a/Code/IO/otbImageIOFactory.cxx b/Code/IO/otbImageIOFactory.cxx
index 00317b1da6..d38bbf7e9d 100755
--- a/Code/IO/otbImageIOFactory.cxx
+++ b/Code/IO/otbImageIOFactory.cxx
@@ -28,9 +28,10 @@
#include "otbGDALImageIOFactory.h"
#include "otbLUMImageIOFactory.h"
#include "otbBSQImageIOFactory.h"
-#ifndef OTB_JPEG2000_DISABLED
-#include "otbJPEG2000ImageIOFactory.h"
-#endif
+// Commented for release 2.2.0
+//#ifndef OTB_JPEG2000_DISABLED
+//#include "otbJPEG2000ImageIOFactory.h"
+//#endif
#ifdef OTB_USE_CURL
#include "otbTileMapImageIOFactory.h"
#endif
@@ -64,11 +65,12 @@ namespace otb
// LUM format for OTB
itk::ObjectFactoryBase::RegisterFactory( LUMImageIOFactory::New() );
-
-#ifndef OTB_JPEG2000_DISABLED
+
+ // Commented for release 2.2.0
+ // #ifndef OTB_JPEG2000_DISABLED
// JPEG2000 : New format for OTB
- itk::ObjectFactoryBase::RegisterFactory( JPEG2000ImageIOFactory::New() );
-#endif
+ // itk::ObjectFactoryBase::RegisterFactory( JPEG2000ImageIOFactory::New() );
+ // #endif
// GDAL : New format for OTB
itk::ObjectFactoryBase::RegisterFactory( GDALImageIOFactory::New() );
diff --git a/Testing/Code/BasicFilters/CMakeLists.txt b/Testing/Code/BasicFilters/CMakeLists.txt
index 5006192eeb..f5af0d0f22 100755
--- a/Testing/Code/BasicFilters/CMakeLists.txt
+++ b/Testing/Code/BasicFilters/CMakeLists.txt
@@ -935,27 +935,27 @@ otbEuclideanDistanceWithMissingValue.cxx
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
ADD_EXECUTABLE(otbBasicFiltersTests1 otbBasicFiltersTests1.cxx ${BasicFilters_SRCS1})
-TARGET_LINK_LIBRARIES(otbBasicFiltersTests1 OTBBasicFilters OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKBasicFilters)
+TARGET_LINK_LIBRARIES(otbBasicFiltersTests1 OTBBasicFilters OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters)
ADD_EXECUTABLE(otbBasicFiltersTests2 otbBasicFiltersTests2.cxx ${BasicFilters_SRCS2})
-TARGET_LINK_LIBRARIES(otbBasicFiltersTests2 OTBBasicFilters OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKBasicFilters)
+TARGET_LINK_LIBRARIES(otbBasicFiltersTests2 OTBBasicFilters OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters)
ADD_EXECUTABLE(otbBasicFiltersTests3 otbBasicFiltersTests3.cxx ${BasicFilters_SRCS3})
-TARGET_LINK_LIBRARIES(otbBasicFiltersTests3 OTBBasicFilters OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKBasicFilters)
+TARGET_LINK_LIBRARIES(otbBasicFiltersTests3 OTBBasicFilters OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters)
ADD_EXECUTABLE(otbBasicFiltersTests4 otbBasicFiltersTests4.cxx ${BasicFilters_SRCS4})
-TARGET_LINK_LIBRARIES(otbBasicFiltersTests4 OTBBasicFilters OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKBasicFilters)
+TARGET_LINK_LIBRARIES(otbBasicFiltersTests4 OTBBasicFilters OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters)
ADD_EXECUTABLE(otbBasicFiltersTests5 otbBasicFiltersTests5.cxx ${BasicFilters_SRCS5})
-TARGET_LINK_LIBRARIES(otbBasicFiltersTests5 OTBBasicFilters OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKBasicFilters)
+TARGET_LINK_LIBRARIES(otbBasicFiltersTests5 OTBBasicFilters OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters)
ADD_EXECUTABLE(otbBasicFiltersTests6 otbBasicFiltersTests6.cxx ${BasicFilters_SRCS6})
-TARGET_LINK_LIBRARIES(otbBasicFiltersTests6 OTBBasicFilters OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKBasicFilters)
+TARGET_LINK_LIBRARIES(otbBasicFiltersTests6 OTBBasicFilters OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters)
ADD_EXECUTABLE(otbBasicFiltersTests7 otbBasicFiltersTests7.cxx ${BasicFilters_SRCS7})
-TARGET_LINK_LIBRARIES(otbBasicFiltersTests7 OTBBasicFilters OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKBasicFilters)
+TARGET_LINK_LIBRARIES(otbBasicFiltersTests7 OTBBasicFilters OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters)
ADD_EXECUTABLE(otbBasicFiltersTests8 otbBasicFiltersTests8.cxx ${BasicFilters_SRCS8})
-TARGET_LINK_LIBRARIES(otbBasicFiltersTests8 OTBBasicFilters OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKBasicFilters)
+TARGET_LINK_LIBRARIES(otbBasicFiltersTests8 OTBBasicFilters OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters)
ENDIF( NOT OTB_DISABLE_CXX_TESTING )
diff --git a/Testing/Code/ChangeDetection/CMakeLists.txt b/Testing/Code/ChangeDetection/CMakeLists.txt
index 5018d84b64..95222622e1 100755
--- a/Testing/Code/ChangeDetection/CMakeLists.txt
+++ b/Testing/Code/ChangeDetection/CMakeLists.txt
@@ -130,9 +130,9 @@ SET(BasicChangeDetection_SRCS2
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
ADD_EXECUTABLE(otbChangeDetectionTests1 otbChangeDetectionTests1.cxx ${BasicChangeDetection_SRCS1})
-TARGET_LINK_LIBRARIES(otbChangeDetectionTests1 OTBChangeDetection OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon ITKStatistics)
+TARGET_LINK_LIBRARIES(otbChangeDetectionTests1 OTBChangeDetection OTBIO OTBCommon gdal ITKIO ITKCommon ITKStatistics)
ADD_EXECUTABLE(otbChangeDetectionTests2 otbChangeDetectionTests2.cxx ${BasicChangeDetection_SRCS2})
-TARGET_LINK_LIBRARIES(otbChangeDetectionTests2 OTBChangeDetection OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon ITKStatistics)
+TARGET_LINK_LIBRARIES(otbChangeDetectionTests2 OTBChangeDetection OTBIO OTBCommon gdal ITKIO ITKCommon ITKStatistics)
ENDIF( NOT OTB_DISABLE_CXX_TESTING )
diff --git a/Testing/Code/Common/CMakeLists.txt b/Testing/Code/Common/CMakeLists.txt
index db9c63173a..a385c83e85 100644
--- a/Testing/Code/Common/CMakeLists.txt
+++ b/Testing/Code/Common/CMakeLists.txt
@@ -573,25 +573,25 @@ INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
# ${TIFF_LIBRARY}
ADD_EXECUTABLE(otbCommonTests1 otbCommonTests1.cxx ${BasicCommon_SRCS1})
-TARGET_LINK_LIBRARIES(otbCommonTests1 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
+TARGET_LINK_LIBRARIES(otbCommonTests1 OTBIO OTBCommon gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
ADD_EXECUTABLE(otbCommonTests2 otbCommonTests2.cxx ${BasicCommon_SRCS2})
-TARGET_LINK_LIBRARIES(otbCommonTests2 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
+TARGET_LINK_LIBRARIES(otbCommonTests2 OTBIO OTBCommon gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
ADD_EXECUTABLE(otbCommonTests3 otbCommonTests3.cxx ${BasicCommon_SRCS3})
-TARGET_LINK_LIBRARIES(otbCommonTests3 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
+TARGET_LINK_LIBRARIES(otbCommonTests3 OTBIO OTBCommon gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
ADD_EXECUTABLE(otbCommonTests4 otbCommonTests4.cxx ${BasicCommon_SRCS4})
-TARGET_LINK_LIBRARIES(otbCommonTests4 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
+TARGET_LINK_LIBRARIES(otbCommonTests4 OTBIO OTBCommon gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
ADD_EXECUTABLE(otbCommonTests5 otbCommonTests5.cxx ${BasicCommon_SRCS5})
-TARGET_LINK_LIBRARIES(otbCommonTests5 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
+TARGET_LINK_LIBRARIES(otbCommonTests5 OTBIO OTBCommon gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
ADD_EXECUTABLE(otbCommonTests6 otbCommonTests6.cxx ${BasicCommon_SRCS6})
-TARGET_LINK_LIBRARIES(otbCommonTests6 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
+TARGET_LINK_LIBRARIES(otbCommonTests6 OTBIO OTBCommon gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
ADD_EXECUTABLE(otbCommonTests7 otbCommonTests7.cxx ${BasicCommon_SRCS7})
-TARGET_LINK_LIBRARIES(otbCommonTests7 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
+TARGET_LINK_LIBRARIES(otbCommonTests7 OTBIO OTBCommon gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
ENDIF( NOT OTB_DISABLE_CXX_TESTING )
diff --git a/Testing/Code/DisparityMap/CMakeLists.txt b/Testing/Code/DisparityMap/CMakeLists.txt
index cf53095b75..159a59f1dd 100644
--- a/Testing/Code/DisparityMap/CMakeLists.txt
+++ b/Testing/Code/DisparityMap/CMakeLists.txt
@@ -303,10 +303,10 @@ SET(BasicDisparityMap_SRCS3
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
ADD_EXECUTABLE(otbDisparityMapTests1 otbDisparityMapTests1.cxx ${BasicDisparityMap_SRCS1})
-TARGET_LINK_LIBRARIES(otbDisparityMapTests1 OTBIO OTBDisparityMap otbopenjpeg gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon ITKNumerics itkvnl)
+TARGET_LINK_LIBRARIES(otbDisparityMapTests1 OTBIO OTBDisparityMap gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon ITKNumerics itkvnl)
ADD_EXECUTABLE(otbDisparityMapTests2 otbDisparityMapTests2.cxx ${BasicDisparityMap_SRCS2})
-TARGET_LINK_LIBRARIES(otbDisparityMapTests2 OTBIO OTBDisparityMap otbopenjpeg gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon ITKNumerics itkvnl)
+TARGET_LINK_LIBRARIES(otbDisparityMapTests2 OTBIO OTBDisparityMap gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon ITKNumerics itkvnl)
ADD_EXECUTABLE(otbDisparityMapTests3 otbDisparityMapTests3.cxx ${BasicDisparityMap_SRCS3})
-TARGET_LINK_LIBRARIES(otbDisparityMapTests3 OTBIO OTBDisparityMap otbopenjpeg gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon ITKNumerics itkvnl)
+TARGET_LINK_LIBRARIES(otbDisparityMapTests3 OTBIO OTBDisparityMap gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon ITKNumerics itkvnl)
ENDIF( NOT OTB_DISABLE_CXX_TESTING )
diff --git a/Testing/Code/FeatureExtraction/CMakeLists.txt b/Testing/Code/FeatureExtraction/CMakeLists.txt
index 029b1f00f1..448ab8510d 100755
--- a/Testing/Code/FeatureExtraction/CMakeLists.txt
+++ b/Testing/Code/FeatureExtraction/CMakeLists.txt
@@ -943,23 +943,23 @@ otbImageToSIFTKeyPointSetFilterOutputAscii.cxx
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
ADD_EXECUTABLE(otbFeatureExtractionTests1 otbFeatureExtractionTests1.cxx ${BasicFeatureExtraction_SRCS1})
-TARGET_LINK_LIBRARIES(otbFeatureExtractionTests1 OTBFeatureExtraction OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKAlgorithms)
+TARGET_LINK_LIBRARIES(otbFeatureExtractionTests1 OTBFeatureExtraction OTBCommon OTBIO gdal ITKIO ITKCommon ITKAlgorithms)
ADD_EXECUTABLE(otbFeatureExtractionTests2 otbFeatureExtractionTests2.cxx ${BasicFeatureExtraction_SRCS2})
-TARGET_LINK_LIBRARIES(otbFeatureExtractionTests2 OTBFeatureExtraction OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKAlgorithms)
+TARGET_LINK_LIBRARIES(otbFeatureExtractionTests2 OTBFeatureExtraction OTBCommon OTBIO gdal ITKIO ITKCommon ITKAlgorithms)
ADD_EXECUTABLE(otbFeatureExtractionTests3 otbFeatureExtractionTests3.cxx ${BasicFeatureExtraction_SRCS3})
-TARGET_LINK_LIBRARIES(otbFeatureExtractionTests3 OTBFeatureExtraction OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKAlgorithms)
+TARGET_LINK_LIBRARIES(otbFeatureExtractionTests3 OTBFeatureExtraction OTBCommon OTBIO gdal ITKIO ITKCommon ITKAlgorithms)
ADD_EXECUTABLE(otbFeatureExtractionTests4 otbFeatureExtractionTests4.cxx ${BasicFeatureExtraction_SRCS4})
-TARGET_LINK_LIBRARIES(otbFeatureExtractionTests4 OTBFeatureExtraction OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKAlgorithms)
+TARGET_LINK_LIBRARIES(otbFeatureExtractionTests4 OTBFeatureExtraction OTBCommon OTBIO gdal ITKIO ITKCommon ITKAlgorithms)
ADD_EXECUTABLE(otbFeatureExtractionTests5 otbFeatureExtractionTests5.cxx ${BasicFeatureExtraction_SRCS5})
-TARGET_LINK_LIBRARIES(otbFeatureExtractionTests5 OTBFeatureExtraction OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKAlgorithms)
+TARGET_LINK_LIBRARIES(otbFeatureExtractionTests5 OTBFeatureExtraction OTBCommon OTBIO gdal ITKIO ITKCommon ITKAlgorithms)
ADD_EXECUTABLE(otbFeatureExtractionTests6 otbFeatureExtractionTests6.cxx ${BasicFeatureExtraction_SRCS6})
-TARGET_LINK_LIBRARIES(otbFeatureExtractionTests6 OTBFeatureExtraction OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKAlgorithms)
+TARGET_LINK_LIBRARIES(otbFeatureExtractionTests6 OTBFeatureExtraction OTBCommon OTBIO gdal ITKIO ITKCommon ITKAlgorithms)
ADD_EXECUTABLE(otbFeatureExtractionTests7 otbFeatureExtractionTests7.cxx ${BasicFeatureExtraction_SRCS7})
-TARGET_LINK_LIBRARIES(otbFeatureExtractionTests7 OTBFeatureExtraction OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKAlgorithms)
+TARGET_LINK_LIBRARIES(otbFeatureExtractionTests7 OTBFeatureExtraction OTBCommon OTBIO gdal ITKIO ITKCommon ITKAlgorithms)
ADD_EXECUTABLE(otbFeatureExtractionTests8 otbFeatureExtractionTests8.cxx ${BasicFeatureExtraction_SRCS8})
-TARGET_LINK_LIBRARIES(otbFeatureExtractionTests8 OTBFeatureExtraction OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKAlgorithms)
+TARGET_LINK_LIBRARIES(otbFeatureExtractionTests8 OTBFeatureExtraction OTBCommon OTBIO gdal ITKIO ITKCommon ITKAlgorithms)
ADD_EXECUTABLE(otbFeatureExtractionTests9 otbFeatureExtractionTests9.cxx ${BasicFeatureExtraction_SRCS9})
-TARGET_LINK_LIBRARIES(otbFeatureExtractionTests9 OTBFeatureExtraction OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKAlgorithms)
+TARGET_LINK_LIBRARIES(otbFeatureExtractionTests9 OTBFeatureExtraction OTBCommon OTBIO gdal ITKIO ITKCommon ITKAlgorithms)
# ADD_EXECUTABLE(roadDetect roadDetect.cxx)
# TARGET_LINK_LIBRARIES(roadDetect OTBFeatureExtraction OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters ITKAlgorithms)
diff --git a/Testing/Code/Fusion/CMakeLists.txt b/Testing/Code/Fusion/CMakeLists.txt
index b6e09d4f2b..3cc279e561 100755
--- a/Testing/Code/Fusion/CMakeLists.txt
+++ b/Testing/Code/Fusion/CMakeLists.txt
@@ -78,9 +78,9 @@ SET(Fusion_SRCS2
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
ADD_EXECUTABLE(otbFusionTests1 otbFusionTests1.cxx ${Fusion_SRCS1})
-TARGET_LINK_LIBRARIES(otbFusionTests1 OTBFusion OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKAlgorithms)
+TARGET_LINK_LIBRARIES(otbFusionTests1 OTBFusion OTBCommon OTBIO gdal ITKIO ITKCommon ITKAlgorithms)
ADD_EXECUTABLE(otbFusionTests2 otbFusionTests2.cxx ${Fusion_SRCS2})
-TARGET_LINK_LIBRARIES(otbFusionTests2 OTBFusion OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKAlgorithms)
+TARGET_LINK_LIBRARIES(otbFusionTests2 OTBFusion OTBCommon OTBIO gdal ITKIO ITKCommon ITKAlgorithms)
ENDIF( NOT OTB_DISABLE_CXX_TESTING )
diff --git a/Testing/Code/Gui/CMakeLists.txt b/Testing/Code/Gui/CMakeLists.txt
index 8c11e0ea11..79b886b79f 100644
--- a/Testing/Code/Gui/CMakeLists.txt
+++ b/Testing/Code/Gui/CMakeLists.txt
@@ -33,6 +33,6 @@ INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
# ${TIFF_LIBRARY}
ADD_EXECUTABLE(otbGuiTests otbGuiTests.cxx ${Gui_SRCS})
-TARGET_LINK_LIBRARIES(otbGuiTests OTBIO OTBGui OTBVisu OTBCommon otbopenjpeg gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon fltk)
+TARGET_LINK_LIBRARIES(otbGuiTests OTBIO OTBGui OTBVisu OTBCommon gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon fltk)
ENDIF( NOT OTB_DISABLE_CXX_TESTING )
diff --git a/Testing/Code/IO/CMakeLists.txt b/Testing/Code/IO/CMakeLists.txt
index 3c25cb5db5..e5de8caccf 100755
--- a/Testing/Code/IO/CMakeLists.txt
+++ b/Testing/Code/IO/CMakeLists.txt
@@ -1264,52 +1264,53 @@ ADD_TEST(ioTvossimElevManagerTest ${IO_TESTS12}
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbIOTESTS13 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-IF(NOT OTB_USE_EXTERNAL_ITK)
-
+# Commented for release 2.2.0
+#IF(NOT OTB_USE_EXTERNAL_ITK)
+#
# --- JPEG2000 can read ---
-ADD_TEST(ioTuJ2KImageIOCanRead ${IO_TESTS13}
- otbJPEG2000ImageIOTestCanRead
- ${INPUTDATA}/bretagne.j2k
- )
+#ADD_TEST(ioTuJ2KImageIOCanRead ${IO_TESTS13}
+# otbJPEG2000ImageIOTestCanRead
+# ${INPUTDATA}/bretagne.j2k
+# )
-ADD_TEST(ioTuJP2ImageIOCanRead ${IO_TESTS13}
- otbJPEG2000ImageIOTestCanRead
- ${IMAGEDATA}/JPEG2000/QB_multicomp.jpx
- )
+#ADD_TEST(ioTuJP2ImageIOCanRead ${IO_TESTS13}
+# otbJPEG2000ImageIOTestCanRead
+# ${IMAGEDATA}/JPEG2000/QB_multicomp.jpx
+# )
-ADD_TEST(ioTuVectorImageFileReaderWriterJ2K2TIF ${IO_TESTS9}
---compare-image ${TOL} ${BASELINE}/ioTvVectorImageFileReaderWriterJ2K2TIFOutput.tif
- ${TEMP}/ioTvVectorImageFileReaderWriterJ2K2TIFOutput.tif
- otbVectorImageFileReaderWriterTest
- ${INPUTDATA}/bretagne.j2k
- ${TEMP}/ioTvVectorImageFileReaderWriterJ2K2TIFOutput.tif
- )
+#ADD_TEST(ioTuVectorImageFileReaderWriterJ2K2TIF ${IO_TESTS9}
+#--compare-image ${TOL} ${BASELINE}/ioTvVectorImageFileReaderWriterJ2K2TIFOutput.tif
+# ${TEMP}/ioTvVectorImageFileReaderWriterJ2K2TIFOutput.tif
+# otbVectorImageFileReaderWriterTest
+# ${INPUTDATA}/bretagne.j2k
+# ${TEMP}/ioTvVectorImageFileReaderWriterJ2K2TIFOutput.tif
+# )
-ADD_TEST(ioTuImageFileReaderWriterJ2K2TIF ${IO_TESTS2}
---compare-image ${TOL} ${BASELINE}/ioTvImageFileReaderWriterJ2K2TIFOutput.tif
- ${TEMP}/ioTvImageFileReaderWriterJ2K2TIFOutput.tif
- otbDoubleImageIOTest
- ${INPUTDATA}/bretagne.j2k
- ${TEMP}/ioTvImageFileReaderWriterJ2K2TIFOutput.tif
- )
+#ADD_TEST(ioTuImageFileReaderWriterJ2K2TIF ${IO_TESTS2}
+#--compare-image ${TOL} ${BASELINE}/ioTvImageFileReaderWriterJ2K2TIFOutput.tif
+# ${TEMP}/ioTvImageFileReaderWriterJ2K2TIFOutput.tif
+# otbDoubleImageIOTest
+# ${INPUTDATA}/bretagne.j2k
+# ${TEMP}/ioTvImageFileReaderWriterJ2K2TIFOutput.tif
+# )
#NOTE: we are comparing with the kakadu output in raw format.
-ADD_TEST(ioTuVectorImageFileReaderWriterJP22TIF ${IO_TESTS9}
---compare-image ${TOL} ${BASELINE}/ioTvVectorImageFileReaderWriterJP22TIFOutput
- ${TEMP}/ioTvVectorImageFileReaderWriterJP22TIFOutput.tif
- otbVectorImageFileReaderWriterTest
- ${IMAGEDATA}/JPEG2000/QB_multicomp_small.jpx
- ${TEMP}/ioTvVectorImageFileReaderWriterJP22TIFOutput.tif
- )
+#ADD_TEST(ioTuVectorImageFileReaderWriterJP22TIF ${IO_TESTS9}
+#--compare-image ${TOL} ${BASELINE}/ioTvVectorImageFileReaderWriterJP22TIFOutput
+# ${TEMP}/ioTvVectorImageFileReaderWriterJP22TIFOutput.tif
+# otbVectorImageFileReaderWriterTest
+# ${IMAGEDATA}/JPEG2000/QB_multicomp_small.jpx
+# ${TEMP}/ioTvVectorImageFileReaderWriterJP22TIFOutput.tif
+# )
-ADD_TEST(ioTuImageFileReaderWriterJP22TIF ${IO_TESTS2}
---compare-image ${TOL} ${BASELINE}/ioTvImageFileReaderWriterJP22TIFOutput.tif
- ${TEMP}/ioTvImageFileReaderWriterJP22TIFOutput.tif
- otbDoubleImageIOTest
- ${IMAGEDATA}/JPEG2000/QB_multicomp_small.jpx
- ${TEMP}/ioTvImageFileReaderWriterJP22TIFOutput.tif
- )
+#ADD_TEST(ioTuImageFileReaderWriterJP22TIF ${IO_TESTS2}
+#--compare-image ${TOL} ${BASELINE}/ioTvImageFileReaderWriterJP22TIFOutput.tif
+# ${TEMP}/ioTvImageFileReaderWriterJP22TIFOutput.tif
+# otbDoubleImageIOTest
+# ${IMAGEDATA}/JPEG2000/QB_multicomp_small.jpx
+# ${TEMP}/ioTvImageFileReaderWriterJP22TIFOutput.tif
+# )
@@ -1318,7 +1319,7 @@ ADD_TEST(ioTuImageFileReaderWriterJP22TIF ${IO_TESTS2}
# otbJPEG2000ImageIOTestCanWrite
# ${INPUTDATA}/toto.j2k
# )
-ENDIF(NOT OTB_USE_EXTERNAL_ITK)
+#ENDIF(NOT OTB_USE_EXTERNAL_ITK)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbIOTESTS14 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1500,15 +1501,16 @@ otbOssimElevManagerTest.cxx
)
-SET(BasicIO_SRCS13
-otbJPEG2000ImageIOTestCanRead.cxx
-otbJPEG2000ImageIOTestCanWrite.cxx
-)
+#SET(BasicIO_SRCS13
+#otbJPEG2000ImageIOTestCanRead.cxx
+#otbJPEG2000ImageIOTestCanWrite.cxx
+#)
-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)
+# Commented for release 2.2.0
+#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)
SET(BasicIO_SRCS14
@@ -1536,51 +1538,51 @@ otbSHPVectorDataIONew.cxx
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
ADD_EXECUTABLE(otbIOTests1 otbIOTests1.cxx ${BasicIO_SRCS1})
-TARGET_LINK_LIBRARIES(otbIOTests1 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon dxf)
+TARGET_LINK_LIBRARIES(otbIOTests1 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
ADD_EXECUTABLE(otbIOTests2 otbIOTests2.cxx ${BasicIO_SRCS2})
-TARGET_LINK_LIBRARIES(otbIOTests2 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon dxf)
+TARGET_LINK_LIBRARIES(otbIOTests2 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
ADD_EXECUTABLE(otbIOTests3 otbIOTests3.cxx ${BasicIO_SRCS3})
-TARGET_LINK_LIBRARIES(otbIOTests3 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon dxf)
+TARGET_LINK_LIBRARIES(otbIOTests3 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
ADD_EXECUTABLE(otbIOTests4 otbIOTests4.cxx ${BasicIO_SRCS2})
-TARGET_LINK_LIBRARIES(otbIOTests4 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon dxf)
+TARGET_LINK_LIBRARIES(otbIOTests4 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
ADD_EXECUTABLE(otbIOTests5 otbIOTests5.cxx ${BasicIO_SRCS5})
-TARGET_LINK_LIBRARIES(otbIOTests5 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon dxf)
+TARGET_LINK_LIBRARIES(otbIOTests5 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
ADD_EXECUTABLE(otbIOTests6 otbIOTests6.cxx ${BasicIO_SRCS6})
-TARGET_LINK_LIBRARIES(otbIOTests6 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon dxf)
+TARGET_LINK_LIBRARIES(otbIOTests6 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
ADD_EXECUTABLE(otbIOTests7 otbIOTests7.cxx ${BasicIO_SRCS7})
-TARGET_LINK_LIBRARIES(otbIOTests7 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon dxf)
+TARGET_LINK_LIBRARIES(otbIOTests7 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
ADD_EXECUTABLE(otbIOTests8 otbIOTests8.cxx ${BasicIO_SRCS8})
-TARGET_LINK_LIBRARIES(otbIOTests8 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon dxf)
+TARGET_LINK_LIBRARIES(otbIOTests8 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
ADD_EXECUTABLE(otbIOTests9 otbIOTests9.cxx ${BasicIO_SRCS9})
-TARGET_LINK_LIBRARIES(otbIOTests9 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon dxf)
+TARGET_LINK_LIBRARIES(otbIOTests9 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
ADD_EXECUTABLE(otbIOTests10 otbIOTests10.cxx ${BasicIO_SRCS10})
-TARGET_LINK_LIBRARIES(otbIOTests10 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon dxf)
+TARGET_LINK_LIBRARIES(otbIOTests10 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
ADD_EXECUTABLE(otbIOTests11 otbIOTests11.cxx ${BasicIO_SRCS11})
-TARGET_LINK_LIBRARIES(otbIOTests11 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon dxf)
+TARGET_LINK_LIBRARIES(otbIOTests11 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
ADD_EXECUTABLE(otbIOTests12 otbIOTests12.cxx ${BasicIO_SRCS12})
-TARGET_LINK_LIBRARIES(otbIOTests12 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon dxf)
+TARGET_LINK_LIBRARIES(otbIOTests12 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
IF(NOT OTB_USE_EXTERNAL_ITK)
ADD_EXECUTABLE(otbIOTests13 otbIOTests13.cxx ${BasicIO_SRCS13})
-TARGET_LINK_LIBRARIES(otbIOTests13 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon dxf)
+TARGET_LINK_LIBRARIES(otbIOTests13 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
ENDIF(NOT OTB_USE_EXTERNAL_ITK)
ADD_EXECUTABLE(otbIOTests14 otbIOTests14.cxx ${BasicIO_SRCS14})
-TARGET_LINK_LIBRARIES(otbIOTests14 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon dxf)
+TARGET_LINK_LIBRARIES(otbIOTests14 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
ADD_EXECUTABLE(otbIOTests15 otbIOTests15.cxx ${BasicIO_SRCS15})
-TARGET_LINK_LIBRARIES(otbIOTests15 OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon dxf)
+TARGET_LINK_LIBRARIES(otbIOTests15 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
ENDIF( NOT OTB_DISABLE_CXX_TESTING )
diff --git a/Testing/Code/IO/otbIOTests13.cxx b/Testing/Code/IO/otbIOTests13.cxx
index 687c9fc287..57dfd8a3a5 100644
--- a/Testing/Code/IO/otbIOTests13.cxx
+++ b/Testing/Code/IO/otbIOTests13.cxx
@@ -28,6 +28,7 @@
void RegisterTests()
{
-REGISTER_TEST(otbJPEG2000ImageIOTestCanRead);
-REGISTER_TEST(otbJPEG2000ImageIOTestCanWrite);
+ // Commented for release 2.2.0
+ // REGISTER_TEST(otbJPEG2000ImageIOTestCanRead);
+ // REGISTER_TEST(otbJPEG2000ImageIOTestCanWrite);
}
diff --git a/Testing/Code/Learning/CMakeLists.txt b/Testing/Code/Learning/CMakeLists.txt
index 0fcf5a3e83..0af51f5029 100644
--- a/Testing/Code/Learning/CMakeLists.txt
+++ b/Testing/Code/Learning/CMakeLists.txt
@@ -339,11 +339,11 @@ otbSVMModelCopyComposedKernelTest.cxx
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
ADD_EXECUTABLE(otbLearningTests1 otbLearningTests1.cxx ${BasicLearning_SRCS1})
-TARGET_LINK_LIBRARIES(otbLearningTests1 gdal otbsvm OTBLearning OTBCommon OTBIO otbopenjpeg ITKIO ITKCommon)
+TARGET_LINK_LIBRARIES(otbLearningTests1 gdal otbsvm OTBLearning OTBCommon OTBIO ITKIO ITKCommon)
ADD_EXECUTABLE(otbLearningTests2 otbLearningTests2.cxx ${BasicLearning_SRCS2})
-TARGET_LINK_LIBRARIES(otbLearningTests2 gdal otbsvm OTBLearning OTBCommon OTBIO otbopenjpeg ITKIO ITKCommon)
+TARGET_LINK_LIBRARIES(otbLearningTests2 gdal otbsvm OTBLearning OTBCommon OTBIO ITKIO ITKCommon)
ADD_EXECUTABLE(otbLearningTests3 otbLearningTests3.cxx ${BasicLearning_SRCS3})
-TARGET_LINK_LIBRARIES(otbLearningTests3 gdal otbsvm OTBLearning OTBCommon OTBIO otbopenjpeg ITKIO ITKCommon)
+TARGET_LINK_LIBRARIES(otbLearningTests3 gdal otbsvm OTBLearning OTBCommon OTBIO ITKIO ITKCommon)
ENDIF( NOT OTB_DISABLE_CXX_TESTING )
diff --git a/Testing/Code/Markov/CMakeLists.txt b/Testing/Code/Markov/CMakeLists.txt
index 2aed603f43..80460c9b48 100755
--- a/Testing/Code/Markov/CMakeLists.txt
+++ b/Testing/Code/Markov/CMakeLists.txt
@@ -181,10 +181,10 @@ otbMRFSamplerRandomMAP.cxx
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
ADD_EXECUTABLE(otbMarkovTests1 otbMarkovTests1.cxx ${Markov_SRCS1})
-TARGET_LINK_LIBRARIES(otbMarkovTests1 OTBMarkov OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKBasicFilters)
+TARGET_LINK_LIBRARIES(otbMarkovTests1 OTBMarkov OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters)
ADD_EXECUTABLE(otbMarkovTests2 otbMarkovTests2.cxx ${Markov_SRCS2})
-TARGET_LINK_LIBRARIES(otbMarkovTests2 OTBMarkov OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKBasicFilters)
+TARGET_LINK_LIBRARIES(otbMarkovTests2 OTBMarkov OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters)
ENDIF( NOT OTB_DISABLE_CXX_TESTING )
diff --git a/Testing/Code/MultiScale/CMakeLists.txt b/Testing/Code/MultiScale/CMakeLists.txt
index 238362b914..39dacb0d02 100644
--- a/Testing/Code/MultiScale/CMakeLists.txt
+++ b/Testing/Code/MultiScale/CMakeLists.txt
@@ -400,10 +400,10 @@ otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
ADD_EXECUTABLE(otbMultiScaleTests1 otbMultiScaleTests1.cxx ${BasicMultiScale_SRCS1})
-TARGET_LINK_LIBRARIES(otbMultiScaleTests1 OTBIO OTBMultiScale otbopenjpeg gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
+TARGET_LINK_LIBRARIES(otbMultiScaleTests1 OTBIO OTBMultiScale gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
ADD_EXECUTABLE(otbMultiScaleTests2 otbMultiScaleTests2.cxx ${BasicMultiScale_SRCS2})
-TARGET_LINK_LIBRARIES(otbMultiScaleTests2 OTBIO OTBMultiScale otbopenjpeg gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
+TARGET_LINK_LIBRARIES(otbMultiScaleTests2 OTBIO OTBMultiScale gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
ADD_EXECUTABLE(otbMultiScaleTests3 otbMultiScaleTests3.cxx ${BasicMultiScale_SRCS3})
-TARGET_LINK_LIBRARIES(otbMultiScaleTests3 OTBIO OTBMultiScale otbopenjpeg gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
+TARGET_LINK_LIBRARIES(otbMultiScaleTests3 OTBIO OTBMultiScale gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
ENDIF( NOT OTB_DISABLE_CXX_TESTING )
diff --git a/Testing/Code/Projections/CMakeLists.txt b/Testing/Code/Projections/CMakeLists.txt
index e90bab9c81..f1f0e5ff92 100755
--- a/Testing/Code/Projections/CMakeLists.txt
+++ b/Testing/Code/Projections/CMakeLists.txt
@@ -328,11 +328,11 @@ SET(Projections_SRCS3
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
ADD_EXECUTABLE(otbProjectionsTests1 otbProjectionsTests1.cxx ${Projections_SRCS1})
-TARGET_LINK_LIBRARIES(otbProjectionsTests1 OTBProjections OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKBasicFilters otbossim)
+TARGET_LINK_LIBRARIES(otbProjectionsTests1 OTBProjections OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters otbossim)
ADD_EXECUTABLE(otbProjectionsTests2 otbProjectionsTests2.cxx ${Projections_SRCS2})
-TARGET_LINK_LIBRARIES(otbProjectionsTests2 OTBProjections OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKBasicFilters otbossim)
+TARGET_LINK_LIBRARIES(otbProjectionsTests2 OTBProjections OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters otbossim)
ADD_EXECUTABLE(otbProjectionsTests3 otbProjectionsTests3.cxx ${Projections_SRCS3})
-TARGET_LINK_LIBRARIES(otbProjectionsTests3 OTBProjections OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKBasicFilters otbossim)
+TARGET_LINK_LIBRARIES(otbProjectionsTests3 OTBProjections OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters otbossim)
ENDIF( NOT OTB_DISABLE_CXX_TESTING )
diff --git a/Testing/Code/Radiometry/CMakeLists.txt b/Testing/Code/Radiometry/CMakeLists.txt
index ff892a8ff7..e0ec71d80d 100755
--- a/Testing/Code/Radiometry/CMakeLists.txt
+++ b/Testing/Code/Radiometry/CMakeLists.txt
@@ -532,13 +532,13 @@ otbAtmosphericCorrectionSequencement.cxx
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
ADD_EXECUTABLE(otbRadiometryTests1 otbRadiometryTests1.cxx ${Radiometry_SRCS1})
-TARGET_LINK_LIBRARIES(otbRadiometryTests1 OTBRadiometry OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKBasicFilters otb6S)
+TARGET_LINK_LIBRARIES(otbRadiometryTests1 OTBRadiometry OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters otb6S)
ADD_EXECUTABLE(otbRadiometryTests2 otbRadiometryTests2.cxx ${Radiometry_SRCS2})
-TARGET_LINK_LIBRARIES(otbRadiometryTests2 OTBRadiometry OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKBasicFilters otb6S)
+TARGET_LINK_LIBRARIES(otbRadiometryTests2 OTBRadiometry OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters otb6S)
ADD_EXECUTABLE(otbRadiometryTests3 otbRadiometryTests3.cxx ${Radiometry_SRCS3})
-TARGET_LINK_LIBRARIES(otbRadiometryTests3 OTBRadiometry OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKBasicFilters otb6S)
+TARGET_LINK_LIBRARIES(otbRadiometryTests3 OTBRadiometry OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters otb6S)
ADD_EXECUTABLE(otbRadiometryTests4 otbRadiometryTests4.cxx ${Radiometry_SRCS4})
-TARGET_LINK_LIBRARIES(otbRadiometryTests4 OTBRadiometry OTBCommon OTBIO otbopenjpeg gdal ITKIO ITKCommon ITKBasicFilters otb6S)
+TARGET_LINK_LIBRARIES(otbRadiometryTests4 OTBRadiometry OTBCommon OTBIO gdal ITKIO ITKCommon ITKBasicFilters otb6S)
ENDIF( NOT OTB_DISABLE_CXX_TESTING )
diff --git a/Testing/Code/SpatialReasoning/CMakeLists.txt b/Testing/Code/SpatialReasoning/CMakeLists.txt
index f06b343e95..7131379a6d 100644
--- a/Testing/Code/SpatialReasoning/CMakeLists.txt
+++ b/Testing/Code/SpatialReasoning/CMakeLists.txt
@@ -237,8 +237,8 @@ otbImageMultiSegmentationToRCC8GraphFilter.cxx
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
ADD_EXECUTABLE(otbSpatialReasoningTests1 otbSpatialReasoningTests1.cxx ${BasicSpatialReasoning_SRCS1})
-TARGET_LINK_LIBRARIES(otbSpatialReasoningTests1 OTBIO OTBSpatialReasoning otbopenjpeg gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
+TARGET_LINK_LIBRARIES(otbSpatialReasoningTests1 OTBIO OTBSpatialReasoning gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
ADD_EXECUTABLE(otbSpatialReasoningTests2 otbSpatialReasoningTests2.cxx ${BasicSpatialReasoning_SRCS2})
-TARGET_LINK_LIBRARIES(otbSpatialReasoningTests2 OTBIO OTBSpatialReasoning otbopenjpeg gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
+TARGET_LINK_LIBRARIES(otbSpatialReasoningTests2 OTBIO OTBSpatialReasoning gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon)
ENDIF( NOT OTB_DISABLE_CXX_TESTING )
diff --git a/Testing/Code/Visu/CMakeLists.txt b/Testing/Code/Visu/CMakeLists.txt
index 71f329c053..56fcd681eb 100755
--- a/Testing/Code/Visu/CMakeLists.txt
+++ b/Testing/Code/Visu/CMakeLists.txt
@@ -208,9 +208,9 @@ otbImageWidgetTransfertFunctionsNew.cxx
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
ADD_EXECUTABLE(otbVisuTests1 otbVisuTests1.cxx ${BasicVisu_SRCS1})
-TARGET_LINK_LIBRARIES(otbVisuTests1 OTBVisu OTBGui OTBIO otbopenjpeg gdal ITKIO ITKCommon ${OTB_VISU_GUI_LIBRARIES} )
+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 otbopenjpeg gdal ITKIO ITKCommon ${OTB_VISU_GUI_LIBRARIES} )
+TARGET_LINK_LIBRARIES(otbVisuTests2 OTBVisu OTBGui OTBIO gdal ITKIO ITKCommon ${OTB_VISU_GUI_LIBRARIES} )
ENDIF( NOT OTB_DISABLE_CXX_TESTING )
diff --git a/Testing/Fa/CMakeLists.txt b/Testing/Fa/CMakeLists.txt
index 40888470a2..756af0da78 100755
--- a/Testing/Fa/CMakeLists.txt
+++ b/Testing/Fa/CMakeLists.txt
@@ -187,13 +187,13 @@ ADD_TEST(FA-00070-vi_Streaming_Stat_bis ${CXX_TEST_PATH}/StreamingStat
)
ADD_EXECUTABLE(AlignementsQB AlignementsQB.cxx)
-TARGET_LINK_LIBRARIES(AlignementsQB OTBFeatureExtraction OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon)
+TARGET_LINK_LIBRARIES(AlignementsQB OTBFeatureExtraction OTBIO OTBCommon gdal ITKIO ITKCommon)
ADD_EXECUTABLE(MapActivation MapActivation.cxx)
-TARGET_LINK_LIBRARIES(MapActivation OTBFeatureExtraction OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon)
+TARGET_LINK_LIBRARIES(MapActivation OTBFeatureExtraction OTBIO OTBCommon gdal ITKIO ITKCommon)
ADD_EXECUTABLE(StreamingStat StreamingStat.cxx)
-TARGET_LINK_LIBRARIES(StreamingStat OTBFeatureExtraction OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKCommon)
+TARGET_LINK_LIBRARIES(StreamingStat OTBFeatureExtraction OTBIO OTBCommon gdal ITKIO ITKCommon)
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
diff --git a/Testing/Utilities/CMakeLists.txt b/Testing/Utilities/CMakeLists.txt
index e01a91c4ab..39995c9c76 100644
--- a/Testing/Utilities/CMakeLists.txt
+++ b/Testing/Utilities/CMakeLists.txt
@@ -423,7 +423,7 @@ INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}")
ADD_EXECUTABLE(otbUtilitiesTests otbUtilitiesTests.cxx ${UtilitiesTests_SRCS})
#TARGET_LINK_LIBRARIES(otbUtilitiesTests OTBIO OTBCommon gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon otbossim otbsvm otb6S tinyXML openjpeg)
-TARGET_LINK_LIBRARIES(otbUtilitiesTests OTBIO OTBCommon otbopenjpeg gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon otbossim otbsvm otb6S tinyXML )
+TARGET_LINK_LIBRARIES(otbUtilitiesTests OTBIO OTBCommon gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon otbossim otbsvm otb6S tinyXML )
IF(UNIX)
TARGET_LINK_LIBRARIES (otbUtilitiesTests m)
ENDIF(UNIX)
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index 7b318441c8..66d50b9d68 100755
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -1,7 +1,10 @@
# Add an option to build or not build the FltkImageViewer Library
+
IF(NOT OTB_USE_EXTERNAL_ITK)
- SUBDIRS( ITK otbopenjpeg)
+# Commented for release 2.2.0
+# SUBDIRS( ITK otbopenjpeg)
+SUBDIRS(ITK)
ENDIF(NOT OTB_USE_EXTERNAL_ITK)
IF(OTB_USE_VISU_GUI)
diff --git a/otbIncludeDirectories.cmake b/otbIncludeDirectories.cmake
index aa7fd1b192..acdc4f8607 100644
--- a/otbIncludeDirectories.cmake
+++ b/otbIncludeDirectories.cmake
@@ -36,7 +36,8 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
${OTB_SOURCE_DIR}/Utilities/otbgeotiff
${OTB_SOURCE_DIR}/Utilities/otbgeotiff/libxtiff
${OTB_SOURCE_DIR}/Utilities/tinyXMLlib
- ${OTB_SOURCE_DIR}/Utilities/otbopenjpeg/libopenjpeg
+# Commented for release 2.2.0
+# ${OTB_SOURCE_DIR}/Utilities/otbopenjpeg/libopenjpeg
# ${OTB_SOURCE_DIR}/Utilities/otbgalib
# ${OTB_SOURCE_DIR}/Utilities/otbkml
# ${OTB_SOURCE_DIR}/Utilities/otbkml/src
@@ -186,7 +187,8 @@ SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbgeotiff
${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbgeotiff/libxtiff
${OTB_INSTALL_INCLUDE_DIR}/Utilities/tinyXMLlib
- ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenjpeg/libopenjpeg
+# Commented for release 2.2.0
+# ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenjpeg/libopenjpeg
# ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbgalib
# ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml
# ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3
--
GitLab