From 503f0bdb72450d6a1217bb5ad4c1c1e6722bb7ca Mon Sep 17 00:00:00 2001 From: Rafal Chojna Date: Wed, 27 Jul 2022 20:32:52 +0200 Subject: [PATCH] Rename $LinkToCRTStaticallyQ variable to $CRTLinkingMode as it is no longer a boolean property. --- tests/UnitTests/CMakeLists.txt | 2 +- tests/UnitTests/TestConfig.wl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/UnitTests/CMakeLists.txt b/tests/UnitTests/CMakeLists.txt index 342f08b..6e344a7 100644 --- a/tests/UnitTests/CMakeLists.txt +++ b/tests/UnitTests/CMakeLists.txt @@ -59,7 +59,7 @@ foreach(UnitTest ${TEST_MODULES}) [===[ Needs["MUnit`"]; $LLUInstallDir = "${CMAKE_INSTALL_PREFIX}"; - $LinkToCRTStaticallyQ = "${LLU_CRT_LINKING}"; + $CRTLinkingMode = "${LLU_CRT_LINKING}"; report = Catch[ TestReport["${UnitTest}TestSuite.mt", MemoryConstraint -> Quantity[500, "MB"], TimeConstraint -> 30], _String, diff --git a/tests/UnitTests/TestConfig.wl b/tests/UnitTests/TestConfig.wl index c1e1b71..ede2a91 100644 --- a/tests/UnitTests/TestConfig.wl +++ b/tests/UnitTests/TestConfig.wl @@ -3,7 +3,7 @@ $baseDir = FileNameDrop[$TestFileName, -3]; $installDir = If[StringQ[$LLUInstallDir], $LLUInstallDir, FileNameJoin[{$baseDir, "install"}]]; -$CRTLinkingFlag = Switch[$LinkToCRTStaticallyQ, +$CRTLinkingFlag = Switch[$CRTLinkingMode, "MultiThreaded", "/MT", "MultiThreadedDLL", "/MD", "MultiThreadedDebug", "/MTd",