From 3c1d9cb41eb2001c57f9ac2aa996092008f42cab Mon Sep 17 00:00:00 2001
From: Aurelien Bricier <aurelien.bricier@c-s.fr>
Date: Tue, 31 Aug 2010 15:26:52 +0200
Subject: [PATCH] COMP: suppress the option OTB_COMPILE_MUPARSER
---
CMakeLists.txt | 9 ---------
Code/BasicFilters/CMakeLists.txt | 6 +-----
Code/Common/CMakeLists.txt | 10 +---------
OTBConfig.cmake.in | 3 ---
Testing/Code/BasicFilters/CMakeLists.txt | 16 +++-------------
Testing/Code/Common/CMakeLists.txt | 10 +---------
UseOTB.cmake.in | 4 ----
Utilities/CMakeLists.txt | 6 +-----
otbIncludeDirectories.cmake | 11 +++--------
9 files changed, 10 insertions(+), 65 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96afcbef05..817e6e9219 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,15 +142,6 @@ MARK_AS_ADVANCED(OTB_USE_DEPRECATED)
# Use the openjpeg library.
OPTION(OTB_USE_JPEG2000 "Use to support jpeg2000 image file format." ON)
-#-----------------------------------------------------------------------------
-#-----------------------------------------------------------------------------
-
-# Use the muparser library.
-OPTION(OTB_COMPILE_MUPARSER "Use to enable muParser fonctionalities." ON)
-IF(OTB_COMPILE_MUPARSER)
- ADD_DEFINITIONS(-DOTB_COMPILE_MUPARSER)
-ENDIF(OTB_COMPILE_MUPARSER)
-
#-----------------------------------------------------------------------------
# Use the liblas library (do not link on solaris)
diff --git a/Code/BasicFilters/CMakeLists.txt b/Code/BasicFilters/CMakeLists.txt
index 730ef790e6..f3f7a6e842 100644
--- a/Code/BasicFilters/CMakeLists.txt
+++ b/Code/BasicFilters/CMakeLists.txt
@@ -3,11 +3,7 @@
FILE(GLOB OTBBasicFilters_SRCS "*.cxx" )
ADD_LIBRARY(OTBBasicFilters ${OTBBasicFilters_SRCS})
-TARGET_LINK_LIBRARIES (OTBBasicFilters OTBCommon ITKBasicFilters otbedison)
-
-IF(OTB_COMPILE_MUPARSER)
- TARGET_LINK_LIBRARIES(OTBBasicFilters otbmuparser)
-ENDIF(OTB_COMPILE_MUPARSER)
+TARGET_LINK_LIBRARIES (OTBBasicFilters OTBCommon ITKBasicFilters otbedison otbmuparser)
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(OTBBasicFilters PROPERTIES ${OTB_LIBRARY_PROPERTIES})
diff --git a/Code/Common/CMakeLists.txt b/Code/Common/CMakeLists.txt
index e5417ba66c..0074af6579 100644
--- a/Code/Common/CMakeLists.txt
+++ b/Code/Common/CMakeLists.txt
@@ -10,17 +10,13 @@ IF( NOT OTB_USE_PQXX )
LIST(REMOVE_ITEM OTBCommon_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbPostGISConnectionImplementation.cxx" )
ENDIF( NOT OTB_USE_PQXX )
-IF( NOT OTB_COMPILE_MUPARSER )
- LIST(REMOVE_ITEM OTBCommon_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbParser.cxx" )
-ENDIF( NOT OTB_COMPILE_MUPARSER )
-
ADD_LIBRARY(OTBCommon ${OTBCommon_SRCS})
#Apparently not supported by opensolaris at least
#SET_TARGET_PROPERTIES(OTBCommon
# PROPERTIES
# LINK_INTERFACE_LIBRARIES ""
#)
-TARGET_LINK_LIBRARIES (OTBCommon ITKAlgorithms ITKStatistics ITKCommon otbconfigfile)
+TARGET_LINK_LIBRARIES (OTBCommon ITKAlgorithms ITKStatistics ITKCommon otbconfigfile otbmuparser)
IF(OTB_USE_MAPNIK)
TARGET_LINK_LIBRARIES(OTBCommon ${MAPNIK_LIBRARY})
ENDIF(OTB_USE_MAPNIK)
@@ -29,10 +25,6 @@ IF(OTB_USE_PQXX)
TARGET_LINK_LIBRARIES(OTBCommon ${PQ_LIBRARY} ${PQXX_LIBRARY})
ENDIF(OTB_USE_PQXX)
-IF(OTB_COMPILE_MUPARSER)
- TARGET_LINK_LIBRARIES(OTBCommon otbmuparser)
-ENDIF(OTB_COMPILE_MUPARSER)
-
IF(OTB_I18N)
TARGET_LINK_LIBRARIES(OTBCommon ${GETTEXT_LIBRARY})
IF(APPLE OR WIN32)
diff --git a/OTBConfig.cmake.in b/OTBConfig.cmake.in
index c659d38f0b..4b597b9002 100644
--- a/OTBConfig.cmake.in
+++ b/OTBConfig.cmake.in
@@ -164,8 +164,5 @@ SET(OTB_CONFIG "@OTB_BINARY_DIR@")
#PQXX file
SET(OTB_USE_PQXX "@OTB_USE_PQXX@")
-#MuParser lib
-SET(OTB_COMPILE_MUPARSER "@OTB_COMPILE_MUPARSER@")
-
#OTB use patented
SET(OTB_USE_PATENTED "@OTB_USE_PATENTED@")
\ No newline at end of file
diff --git a/Testing/Code/BasicFilters/CMakeLists.txt b/Testing/Code/BasicFilters/CMakeLists.txt
index de9a326c92..98f5a2a662 100644
--- a/Testing/Code/BasicFilters/CMakeLists.txt
+++ b/Testing/Code/BasicFilters/CMakeLists.txt
@@ -28,9 +28,7 @@ SET(BASICFILTERS_TESTS9 ${CXX_TEST_PATH}/otbBasicFiltersTests9)
SET(BASICFILTERS_TESTS10 ${CXX_TEST_PATH}/otbBasicFiltersTests10)
SET(BASICFILTERS_TESTS11 ${CXX_TEST_PATH}/otbBasicFiltersTests11)
SET(BASICFILTERS_TESTS12 ${CXX_TEST_PATH}/otbBasicFiltersTests12)
-IF(OTB_COMPILE_MUPARSER)
- SET(BASICFILTERS_TESTS13 ${CXX_TEST_PATH}/otbBasicFiltersTests13)
-ENDIF(OTB_COMPILE_MUPARSER)
+SET(BASICFILTERS_TESTS13 ${CXX_TEST_PATH}/otbBasicFiltersTests13)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbBasicFiltersTests1 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1633,16 +1631,12 @@ ADD_TEST(bfTvImageAndVectorImageOperationFilterTest ${BASICFILTERS_TESTS12}
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ---------------------------- otbNaryParserFunctorImageFilter ----------------------------
-IF(OTB_COMPILE_MUPARSER)
-
ADD_TEST(bfTuBandMathImageFilter ${BASICFILTERS_TESTS13}
otbBandMathImageFilterNew)
ADD_TEST(bfTvBandMathImageFilter ${BASICFILTERS_TESTS13}
otbBandMathImageFilter)
-ENDIF(OTB_COMPILE_MUPARSER)
-
# A enrichir
SET(BasicFilters_SRCS1
@@ -1878,13 +1872,11 @@ otbImageAndVectorImageOperationFilterNew.cxx
otbImageAndVectorImageOperationFilterTest.cxx
)
-IF(OTB_COMPILE_MUPARSER)
-# A enrichir
SET(BasicFilters_SRCS13
otbBasicFiltersTests13.cxx
otbBandMathImageFilter.cxx
)
-ENDIF(OTB_COMPILE_MUPARSER)
+
OTB_ADD_EXECUTABLE(otbBasicFiltersTests1 "${BasicFilters_SRCS1}" "OTBBasicFilters;OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbBasicFiltersTests2 "${BasicFilters_SRCS2}" "OTBBasicFilters;OTBIO;OTBTesting")
@@ -1898,8 +1890,6 @@ OTB_ADD_EXECUTABLE(otbBasicFiltersTests9 "${BasicFilters_SRCS9}" "OTBBasicFilter
OTB_ADD_EXECUTABLE(otbBasicFiltersTests10 "${BasicFilters_SRCS10}" "OTBBasicFilters;OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbBasicFiltersTests11 "${BasicFilters_SRCS11}" "OTBBasicFilters;ITKAlgorithms;OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbBasicFiltersTests12 "${BasicFilters_SRCS12}" "OTBBasicFilters;ITKAlgorithms;OTBIO;OTBTesting")
-IF(OTB_COMPILE_MUPARSER)
- OTB_ADD_EXECUTABLE(otbBasicFiltersTests13 "${BasicFilters_SRCS13}" "OTBBasicFilters;OTBIO;OTBTesting")
-ENDIF(OTB_COMPILE_MUPARSER)
+OTB_ADD_EXECUTABLE(otbBasicFiltersTests13 "${BasicFilters_SRCS13}" "OTBBasicFilters;OTBIO;OTBTesting")
ENDIF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING )
diff --git a/Testing/Code/Common/CMakeLists.txt b/Testing/Code/Common/CMakeLists.txt
index afbd8b157a..fd8ed325ef 100644
--- a/Testing/Code/Common/CMakeLists.txt
+++ b/Testing/Code/Common/CMakeLists.txt
@@ -32,9 +32,7 @@ IF(OTB_USE_PQXX)
SET(COMMON_TESTS10 ${CXX_TEST_PATH}/otbCommonTests10)
ENDIF(OTB_USE_PQXX)
SET(COMMON_TESTS11 ${CXX_TEST_PATH}/otbCommonTests11)
-IF(OTB_COMPILE_MUPARSER)
SET(COMMON_TESTS12 ${CXX_TEST_PATH}/otbCommonTests12)
-ENDIF(OTB_COMPILE_MUPARSER)
SET(COMMON_TESTS13 ${CXX_TEST_PATH}/otbCommonTests13)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1000,7 +998,6 @@ otbVectorDataToLabelMapFilter
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ---------------- otbParser ---------------------#
-IF(OTB_COMPILE_MUPARSER)
ADD_TEST(coTuParser ${COMMON_TESTS12}
otbParserTestNew
)
@@ -1008,7 +1005,6 @@ IF(OTB_COMPILE_MUPARSER)
ADD_TEST(coTvParser ${COMMON_TESTS12}
otbParserTest
)
-ENDIF(OTB_COMPILE_MUPARSER)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1182,12 +1178,10 @@ otbLabelObjectMapVectorizer.cxx
)
-IF(OTB_COMPILE_MUPARSER)
SET(BasicCommon_SRCS12
otbCommonTests12.cxx
otbParserTest.cxx
)
-ENDIF(OTB_COMPILE_MUPARSER)
SET(BasicCommon_SRCS13
@@ -1212,10 +1206,8 @@ TARGET_LINK_LIBRARIES(otbCommonTests10 OTBIO OTBTesting OTBGeospatialAnalysis p
ENDIF(OTB_USE_PQXX)
ADD_EXECUTABLE(otbCommonTests11 otbCommonTests11.cxx ${BasicCommon_SRCS11})
TARGET_LINK_LIBRARIES(otbCommonTests11 OTBIO OTBTesting itkvcl)
-IF(OTB_COMPILE_MUPARSER)
- OTB_ADD_EXECUTABLE(otbCommonTests12 "${BasicCommon_SRCS12}" "OTBIO;OTBTesting")
-ENDIF(OTB_COMPILE_MUPARSER)
+OTB_ADD_EXECUTABLE(otbCommonTests12 "${BasicCommon_SRCS12}" "OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbCommonTests13 "${BasicCommon_SRCS13}" "OTBIO;OTBTesting")
ENDIF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING )
diff --git a/UseOTB.cmake.in b/UseOTB.cmake.in
index 415a5ad026..1dba18d67c 100644
--- a/UseOTB.cmake.in
+++ b/UseOTB.cmake.in
@@ -137,7 +137,3 @@ IF(OTB_CURL_MULTI_AVAILABLE)
ADD_DEFINITIONS(-DOTB_CURL_MULTI_AVAILABLE)
ENDIF(OTB_CURL_MULTI_AVAILABLE)
-
-IF(OTB_COMPILE_MUPARSER)
-ADD_DEFINITIONS(-DOTB_COMPILE_MUPARSER)
-ENDIF(OTB_COMPILE_MUPARSER)
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index e28dcc549c..48591ac1f5 100644
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -39,11 +39,7 @@ IF(NOT OTB_USE_EXTERNAL_BOOST)
ENDIF(NOT OTB_USE_EXTERNAL_BOOST)
-IF(OTB_COMPILE_MUPARSER)
- ADD_SUBDIRECTORY(otbmuparser)
-ENDIF(OTB_COMPILE_MUPARSER)
-
-
+ADD_SUBDIRECTORY(otbmuparser)
ADD_SUBDIRECTORY(otbsvm )
ADD_SUBDIRECTORY(otbknn )
ADD_SUBDIRECTORY(dxflib)
diff --git a/otbIncludeDirectories.cmake b/otbIncludeDirectories.cmake
index dcd4af2fa1..b76f89416c 100644
--- a/otbIncludeDirectories.cmake
+++ b/otbIncludeDirectories.cmake
@@ -66,14 +66,11 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
${OTB_SOURCE_DIR}/Utilities/otbsiftfast
${OTB_SOURCE_DIR}/Utilities/otbconfigfile
${OTB_SOURCE_DIR}/Utilities/otbknn
+ ${OTB_SOURCE_DIR}/Utilities/otbmuparser
${OTB_BINARY_DIR}/Code/Visualization
${OTB_SOURCE_DIR}/Code/OBIA
)
-IF(OTB_COMPILE_MUPARSER)
- SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
- ${OTB_SOURCE_DIR}/Utilities/otbmuparser)
-ENDIF(OTB_COMPILE_MUPARSER)
IF(NOT OTB_USE_EXTERNAL_BOOST)
SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
@@ -326,11 +323,9 @@ SET(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
Utilities/dxflib
Utilities/otbconfigfile
Utilities/otbknn
+ Utilities/otbmuparser
)
-IF(OTB_COMPILE_MUPARSER)
- SET(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
- Utilities/otbmuparser)
-ENDIF(OTB_COMPILE_MUPARSER)
+
IF(OTB_COMPILE_JPEG2000)
SET(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
--
GitLab