From 0b97619b68771cc7d8c2772b72c974433a6ceb5a Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Thu, 5 Jul 2012 14:01:18 +0200
Subject: [PATCH] COMP: simplify OTBConfig
---
CMake/OTBConfig.cmake.in | 56 +++++-----------------------------------
1 file changed, 7 insertions(+), 49 deletions(-)
diff --git a/CMake/OTBConfig.cmake.in b/CMake/OTBConfig.cmake.in
index c8f6bcac6e..3259532df8 100644
--- a/CMake/OTBConfig.cmake.in
+++ b/CMake/OTBConfig.cmake.in
@@ -64,48 +64,27 @@ IF(NOT OTB_NO_LIBRARY_DEPENDS AND
ENDIF(NOT OTB_NO_LIBRARY_DEPENDS AND
EXISTS "@OTB_LIBRARY_DEPENDS_FILE@")
-# Whether OTB was built using a system VXL.
-SET(OTB_USE_SYSTEM_VXL "@OTB_USE_SYSTEM_VXL@")
+#Configuration file
+SET(OTB_CONFIG "@OTB_BINARY_DIR@")
-# The VXL_DIR setting used to build OTB. Set if OTB_USE_SYSTEM_VXL is true.
+# The OTB configuration options
+SET(OTB_SHOW_ALL_MSG_DEBUG "@OTB_SHOW_ALL_MSG_DEBUG@")
+SET(OTB_USE_SYSTEM_VXL "@OTB_USE_SYSTEM_VXL@")
SET(OTB_VXL_DIR "@OTB_VXL_DIR@")
-
-# The OTB Visu Gui informations
+SET(USE_FFTWF "@USE_FFTWF@")
+SET(USE_FFTWD "@USE_FFTWD@")
SET(OTB_USE_VISU_GUI "@OTB_USE_VISU_GUI@")
SET(OTB_VISU_GUI_LIBRARIES "@OTB_VISU_GUI_LIBRARIES@")
-
-# Video card acceleration
SET(OTB_GL_USE_ACCEL "@OTB_GL_USE_ACCEL@")
-
-# Curl library
SET(OTB_USE_CURL "@OTB_USE_CURL@")
SET(OTB_CURL_MULTI_AVAILABLE "@OTB_CURL_MULTI_AVAILABLE@")
-
-#Developpers message
-SET(OTB_SHOW_ALL_MSG_DEBUG "@OTB_SHOW_ALL_MSG_DEBUG@")
-
-# Option use external BOOST.
SET(OTB_USE_EXTERNAL_BOOST "@OTB_USE_EXTERNAL_BOOST@")
-
-# Option use external EXPAT.
SET(OTB_USE_EXTERNAL_EXPAT "@OTB_USE_EXTERNAL_EXPAT@")
-
-# Option use external OpenThread.
SET(OTB_USE_EXTERNAL_OPENTHREADS "@OTB_USE_EXTERNAL_OPENTHREADS@")
-
-# Option use external GDAL.
SET(OTB_USE_EXTERNAL_GDAL "@OTB_USE_EXTERNAL_GDAL@")
-
-# Option use external LibKML.
SET(OTB_USE_EXTERNAL_LIBKML "@OTB_USE_EXTERNAL_LIBKML@")
-
-# Option use external TinyXML.
SET(OTB_USE_EXTERNAL_TINYXML "@OTB_USE_EXTERNAL_TINYXML@")
-
-# Option use external MuParser.
SET(OTB_USE_EXTERNAL_MUPARSER "@OTB_USE_EXTERNAL_MUPARSER@")
-
-# Internationalization
SET(OTB_USE_GETTEXT "@OTB_USE_GETTEXT@")
SET(OTB_I18N "@OTB_I18N@")
SET(OTB_LANG "@OTB_LANG@")
@@ -115,32 +94,11 @@ SET(GETTEXT_MSGMERGE_EXECUTABLE "@GETTEXT_MSGMERGE_EXECUTABLE@")
SET(GETTEXT_INCLUDE_DIR "@GETTEXT_INCLUDE_DIR@")
SET(GETTEXT_LIBRARY "@GETTEXT_LIBRARY@")
SET(GETTEXT_INTL_LIBRARY "@GETTEXT_INTL_LIBRARY@")
-
-#Configuration file
-SET(OTB_CONFIG "@OTB_BINARY_DIR@")
-
-#PQXX support
SET(OTB_USE_PQXX "@OTB_USE_PQXX@")
-
-#OTB use patented
SET(OTB_USE_PATENTED "@OTB_USE_PATENTED@")
-
-#LibLAS support
SET(OTB_USE_LIBLAS "@OTB_USE_LIBLAS@")
SET(OTB_USE_EXTERNAL_LIBLAS "@OTB_USE_EXTERNAL_LIBLAS@")
-
-#Mapnik support
SET(OTB_USE_MAPNIK "@OTB_USE_MAPNIK@")
SET(OTB_MAPNIK_SUPPORTS_API20 "@OTB_MAPNIK_SUPPORTS_API20@")
-
-#Jpeg2000 support
SET(OTB_USE_JPEG2000 "@OTB_USE_JPEG2000@")
-
-#FFTWF support
-SET(USE_FFTWF "@USE_FFTWF@")
-
-#FFTWD support
-SET(USE_FFTWD "@USE_FFTWD@")
-
-#SiftFast support
SET(OTB_USE_SIFTFAST "@OTB_USE_SIFTFAST@")
--
GitLab