diff --git a/Modules/ThirdParty/MuParserX/CMakeLists.txt b/Modules/ThirdParty/MuParserX/CMakeLists.txt index 7aa22a8c87a76e9ccf440a7fbf260f1fb17cba2f..1d7891da04fe06837ee5244e74c049c08acbce31 100644 --- a/Modules/ThirdParty/MuParserX/CMakeLists.txt +++ b/Modules/ThirdParty/MuParserX/CMakeLists.txt @@ -2,13 +2,5 @@ project(OTBMuParserX) set(OTBMuParserX_SYSTEM_INCLUDE_DIRS ${MUPARSERX_INCLUDE_DIRS}) set(OTBMuParserX_LIBRARIES "${MUPARSERX_LIBRARIES}") -set(OTBMuParserX_INCLUDE_DIRS ${OTBMuParserX_BINARY_DIR}/src) - -configure_file( src/mpCompat.h.in src/mpCompat.h ) otb_module_impl() - -install(FILES ${OTBMuParserX_BINARY_DIR}/src/mpCompat.h - DESTINATION ${OTBMuParserX_INSTALL_INCLUDE_DIR} - COMPONENT Development - ) diff --git a/Modules/ThirdParty/MuParserX/otb-module.cmake b/Modules/ThirdParty/MuParserX/otb-module.cmake index b44f57f995243ee642873079101e53a59f06bddb..46b52ad5c2c685e82927b9f21ce7076acfc7dcb1 100644 --- a/Modules/ThirdParty/MuParserX/otb-module.cmake +++ b/Modules/ThirdParty/MuParserX/otb-module.cmake @@ -10,3 +10,5 @@ otb_module(OTBMuParserX ) otb_module_activation_option("Enable MuParserX dependent modules" OFF) + +otb_module_requires_cxx11() diff --git a/Modules/ThirdParty/MuParserX/src/mpCompat.h.in b/Modules/ThirdParty/MuParserX/src/mpCompat.h.in deleted file mode 100644 index 7ac031c6b821a0719bb681b53a384d42a56daaeb..0000000000000000000000000000000000000000 --- a/Modules/ThirdParty/MuParserX/src/mpCompat.h.in +++ /dev/null @@ -1,46 +0,0 @@ -/*========================================================================= - - Program: ORFEO Toolbox - Language: C++ - Date: $Date$ - Version: $Revision$ - - - Copyright (c) Centre National d'Etudes Spatiales. All rights reserved. - See OTBCopyright.txt for details. - - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notices for more information. - -=========================================================================*/ -#ifndef MUP_COMPAT_H -#define MUP_COMPAT_H - -/* defined if OTB_CXX_HAS_UNIQUE_PTR cmake check is OK. */ -/* See CMake/OTBCheckCpp11Keywords.cmake for more details */ -#cmakedefine OTB_CXX_HAS_UNIQUE_PTR - -#ifndef OTB_CXX_HAS_UNIQUE_PTR -#define unique_ptr auto_ptr -#endif - -/* defined if OTB_CXX_HAS_OVERRIDE_SPECIFIER cmake check is OK. */ -/* See CMake/OTBCheckCpp11Keywords.cmake for more details */ -#cmakedefine OTB_CXX_HAS_OVERRIDE_SPECIFIER - -#ifndef OTB_CXX_HAS_OVERRIDE_SPECIFIER -#define override -#endif - -/* defined if OTB_CXX_HAS_NULLPTR cmake check is OK. */ -/* See CMake/OTBCheckCpp11Keywords.cmake for more details */ -#cmakedefine OTB_CXX_HAS_NULLPTR - -#ifndef OTB_CXX_HAS_NULLPTR -#define nullptr NULL -#endif - - -#endif //MUP_COMPAT_H diff --git a/SuperBuild/CMake/External_muparserx.cmake b/SuperBuild/CMake/External_muparserx.cmake index fe64272d9138f71270efd9940a784f046339c29e..b1d6251eb8935c39d0eb7d34fbfca4816e80909f 100644 --- a/SuperBuild/CMake/External_muparserx.cmake +++ b/SuperBuild/CMake/External_muparserx.cmake @@ -7,16 +7,10 @@ if(APPLE) set(MUPARSERX_FLAGS "-DCMAKE_CXX_FLAGS:STRING=-std=c++0x") endif() -# We provide a zip archive of last muparserx release (3.0.5) -# Archive was generated using commit sha on muparserx github page -# Commands to create source archive: -# wget https://github.com/beltoforion/muparserx/archive/2ace83b5411f1ab9940653c2bab0efa5140efb71.zip -# mv 2ace83b5411f1ab9940653c2bab0efa5140efb71.zip muparserx_v3_0_5.zip - ExternalProject_Add(MUPARSERX PREFIX MUPARSERX - URL "https://www.orfeo-toolbox.org/packages/muparserx_v3_0_5.zip" - URL_MD5 ad86b88c159ab68f4bfc99d71166e3c5 + URL "https://github.com/beltoforion/muparserx/archive/v4.0.7.zip" + URL_MD5 67819fc478436ea8f647c804e6f2e1a2 BINARY_DIR ${MUPARSERX_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} DOWNLOAD_DIR ${DOWNLOAD_LOCATION} @@ -31,4 +25,4 @@ ExternalProject_Add(MUPARSERX ${MUPARSERX_SB_SRC}/parser/ ) -SUPERBUILD_UPDATE_CMAKE_VARIABLES(MUPARSERX FALSE) \ No newline at end of file +SUPERBUILD_UPDATE_CMAKE_VARIABLES(MUPARSERX FALSE)