From cb7bb9821d9e4634e2938c4ccc618788cbb4b995 Mon Sep 17 00:00:00 2001 From: Hans-Peter Gygax Date: Sun, 24 May 2020 19:55:52 +0200 Subject: [PATCH] Change CMakeLists to honor option "MSVC shared Runtimes" (#867) --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e03eed9..3f47f27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,10 +34,11 @@ endif() set(build-shared $) set(build-windows-dll $,${build-shared}>) set(not-msvc $>) +set(msvc-shared_rt $) if (NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY) set(CMAKE_MSVC_RUNTIME_LIBRARY - MultiThreaded$<$:Debug>$<${build-shared}:DLL>) + MultiThreaded$<$:Debug>$<${msvc-shared_rt}:DLL>) endif() set(contrib-pattern "src/contrib/*.cpp") @@ -108,7 +109,7 @@ target_sources(yaml-cpp PRIVATE $<$:${yaml-cpp-contrib-sources}> ${yaml-cpp-sources}) - + if (NOT DEFINED CMAKE_DEBUG_POSTFIX) set(CMAKE_DEBUG_POSTFIX "d") endif()