From c21073f1426626abb0a585361fe09e9e5a546f41 Mon Sep 17 00:00:00 2001
From: Cyrille Valladeau <cyrille.valladeau@c-s.fr>
Date: Tue, 17 Jun 2008 12:17:25 +0000
Subject: [PATCH] Correction dans le CMakeList (remove de fichiers).
---
Code/IO/CMakeLists.txt | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/Code/IO/CMakeLists.txt b/Code/IO/CMakeLists.txt
index 4402cf9fdf..4eac3f8aea 100755
--- a/Code/IO/CMakeLists.txt
+++ b/Code/IO/CMakeLists.txt
@@ -60,12 +60,17 @@ ENDIF( NOT OTB_USE_CURL )
# Case for release 2.2.1
-IF(OTB_USE_EXTERNAL_ITK)
- 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_JPEG2000)
-ENDIF(OTB_USE_EXTERNAL_ITK)
+IF(OTB_USE_EXTERNAL_ITK OR NOT 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_EXTERNAL_ITK OR NOT OTB_USE_JPEG2000)
+
+#IF(OTB_USE_EXTERNAL_ITK)
+# 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_JPEG2000)
+#ENDIF(OTB_USE_EXTERNAL_ITK)
INSTALL(FILES ${__files1} ${__files2}
--
GitLab