Commit 727bc474 authored by Manuel Grizonnet's avatar Manuel Grizonnet

Revert "ENH: forward superbuild compilation option to muparserx"

This reverts commit aa6cdb03.
parent e0eab2ab
......@@ -12,16 +12,6 @@ if(MSVC AND BUILD_SHARED_LIBS)
list(APPEND MUPARSERX_FLAGS -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS:BOOL=ON)
endif()
# forward compilation flags (muparserx has to be compile with cxx11 and muparserx CMakeLists.txt does not seem to add this flag automatically...)
set(MUPARSERX_SB_COMPILATION_FLAGS
-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}
-DCMAKE_MODULE_LINKER_FLAGS:STRING=${CMAKE_MODULE_LINKER_FLAGS}
-DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_SHARED_LINKER_FLAGS}
-DCMAKE_STATIC_LINKER_FLAGS:STRING=${CMAKE_STATIC_LINKER_FLAGS}
)
ExternalProject_Add(MUPARSERX
PREFIX MUPARSERX
URL "https://github.com/beltoforion/muparserx/archive/v4.0.7.zip"
......@@ -31,7 +21,6 @@ ExternalProject_Add(MUPARSERX
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CMAKE_CACHE_ARGS
${SB_CMAKE_CACHE_ARGS}
${MUPARSERX_SB_COMPILATION_FLAGS}
${MUPARSERX_FLAGS}
CMAKE_COMMAND ${SB_CMAKE_COMMAND}
DEPENDS ${MUPARSERX_DEPENDENCIES}
......@@ -39,3 +28,5 @@ ExternalProject_Add(MUPARSERX
#Patch mpParserMessageProvider.cpp. This patch is integrated upstream but not yet released (last release is 4.0.7)
SUPERBUILD_PATCH_SOURCE(MUPARSERX)
SUPERBUILD_UPDATE_CMAKE_VARIABLES(MUPARSERX FALSE)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment