summaryrefslogtreecommitdiffstats
path: root/Utilities/Release
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-08-22 18:15:23 (GMT)
committerBrad King <brad.king@kitware.com>2019-08-23 14:55:58 (GMT)
commited54d877894499319d67628b730053484e97049c (patch)
treec3ed617efd305a6802e4d429cf06c305ceea5dd7 /Utilities/Release
parent130dbe4a5d49baa4404a399860bd3a6182783ece (diff)
downloadCMake-ed54d877894499319d67628b730053484e97049c.zip
CMake-ed54d877894499319d67628b730053484e97049c.tar.gz
CMake-ed54d877894499319d67628b730053484e97049c.tar.bz2
Configure CMake itself with policies through CMake 3.15
In particular, set `CMP0091` to `NEW` to enable the MSVC runtime library abstraction so it can be set via `CMAKE_MSVC_RUNTIME_LIBRARY` in the cache.
Diffstat (limited to 'Utilities/Release')
-rw-r--r--Utilities/Release/WiX/CustomAction/CMakeLists.txt18
1 files changed, 12 insertions, 6 deletions
diff --git a/Utilities/Release/WiX/CustomAction/CMakeLists.txt b/Utilities/Release/WiX/CustomAction/CMakeLists.txt
index 7efd01e..9d89dd8 100644
--- a/Utilities/Release/WiX/CustomAction/CMakeLists.txt
+++ b/Utilities/Release/WiX/CustomAction/CMakeLists.txt
@@ -1,9 +1,15 @@
-foreach(CONFIG DEBUG MINSIZEREL RELEASE RELWITHDEBINFO)
- string(REPLACE "/MD" "/MT"
- "CMAKE_CXX_FLAGS_${CONFIG}"
- "${CMAKE_CXX_FLAGS_${CONFIG}}"
- )
-endforeach()
+if(MSVC)
+ if(NOT CMAKE_VERSION VERSION_LESS 3.15)
+ set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+ else()
+ foreach(CONFIG DEBUG MINSIZEREL RELEASE RELWITHDEBINFO)
+ string(REPLACE "/MD" "/MT"
+ "CMAKE_CXX_FLAGS_${CONFIG}"
+ "${CMAKE_CXX_FLAGS_${CONFIG}}"
+ )
+ endforeach()
+ endif()
+endif()
add_library(CMakeWiXCustomActions MODULE
detect_nsis_overwrite.cpp