From aa6cdb03380b0940e725077993783fe268f172b9 Mon Sep 17 00:00:00 2001
From: Manuel Grizonnet <manuel.grizonnet@cnes.fr>
Date: Mon, 5 Dec 2016 13:00:10 +0100
Subject: [PATCH] ENH: forward superbuild compilation option to muparserx
---
SuperBuild/CMake/External_muparserx.cmake | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/SuperBuild/CMake/External_muparserx.cmake b/SuperBuild/CMake/External_muparserx.cmake
index c17e40d1cb..f5d21a70cb 100644
--- a/SuperBuild/CMake/External_muparserx.cmake
+++ b/SuperBuild/CMake/External_muparserx.cmake
@@ -12,6 +12,16 @@ 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"
@@ -21,6 +31,7 @@ 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}
@@ -28,5 +39,3 @@ 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)
--
GitLab