vcpkg bugfix /MT vs /MD

silverqx · Jul 5, 2024 · 3ab6c8e · 3ab6c8e
1 parent 8c0ea8d
commit 3ab6c8e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -126,7 +126,8 @@ when the build type is equal" OFF
 feature_option_dependent(MSVC_RUNTIME_DYNAMIC
     "Use MSVC dynamic runtime library (-MD) instead of static (-MT), also considers \
 a Debug configuration (-MTd, -MDd)" ON
-    "MSVC AND (NOT TINY_VCPKG OR NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)"
+    "MSVC AND NOT TINY_VCPKG AND NOT DEFINED VCPKG_CRT_LINKAGE AND \
+NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY"
     MSVC_RUNTIME_DYNAMIC-NOTFOUND
 )
 

diff --git a/cmake/Modules/TinyInitDefaultVariables.cmake b/cmake/Modules/TinyInitDefaultVariables.cmake
@@ -46,7 +46,10 @@ DESTINATION is encountered.")
     # strictly needed as on vcpkg the MSVC_RUNTIME_DYNAMIC isn't defined/used but with
     # the TINY_VCPKG is clearly visible whats up.
     # Also see the comment for the MSVC_RUNTIME_DYNAMIC option.
-    if(MSVC AND (NOT TINY_VCPKG OR DEFINED MSVC_RUNTIME_DYNAMIC))
+    if(MSVC AND NOT TINY_VCPKG AND NOT DEFINED VCPKG_CRT_LINKAGE AND
+            DEFINED MSVC_RUNTIME_DYNAMIC AND
+            NOT MSVC_RUNTIME_DYNAMIC STREQUAL "MSVC_RUNTIME_DYNAMIC-NOTFOUND"
+    )
         if(MSVC_RUNTIME_DYNAMIC)
             set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
         else()