From 777ad8ddcde13b7daa06f9f2ed03041a77300609 Mon Sep 17 00:00:00 2001 From: David Wells Date: Mon, 28 Mar 2022 16:06:52 -0400 Subject: [PATCH] Fix linkage on Windows with muParser. --- bundled/muparser_v2_3_3/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bundled/muparser_v2_3_3/CMakeLists.txt b/bundled/muparser_v2_3_3/CMakeLists.txt index 1fcf61cf51..2da17525c1 100644 --- a/bundled/muparser_v2_3_3/CMakeLists.txt +++ b/bundled/muparser_v2_3_3/CMakeLists.txt @@ -39,4 +39,8 @@ src/muParserTest.cpp src/muParserTokenReader.cpp ) -#DEAL_II_ADD_DEFINITIONS(obj_muparser "FP_USE_THREAD_SAFE_EVAL") +# We do not support (yet) compiling DLLs with MSVC. By default, muParser will +# try to set itself up correctly with __declspec(dllexport). Get around this by +# instructing it to use static linkage, which will define (see muParserFixes.h) +# AP_EXPORT_CXX to nothing. +DEAL_II_ADD_DEFINITIONS(obj_muparser "MUPARSER_STATIC") -- 2.39.5