From: David Wells <drwells@email.unc.edu>
Date: Mon, 28 Mar 2022 20:06:52 +0000 (-0400)
Subject: Fix linkage on Windows with muParser.
X-Git-Tag: v9.4.0-rc1~318^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F13581%2Fhead;p=dealii.git

Fix linkage on Windows with muParser.
---

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")