]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix linkage on Windows with muParser. 13581/head
authorDavid Wells <drwells@email.unc.edu>
Mon, 28 Mar 2022 20:06:52 +0000 (16:06 -0400)
committerDavid Wells <drwells@email.unc.edu>
Mon, 28 Mar 2022 20:06:52 +0000 (16:06 -0400)
bundled/muparser_v2_3_3/CMakeLists.txt

index 1fcf61cf5178c21df73dd545906e062d368daa99..2da17525c114d3893b6341402cda6a8f4265f5f0 100644 (file)
@@ -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")

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.