From 465a0e1c298363052536f36ba61e59441f62a3f9 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sun, 4 Feb 2024 01:44:53 +0100 Subject: [PATCH] Remove incorrect mixing of runtime versions --- Thirdparty/ZVulkan/CMakeLists.txt | 6 +++--- Thirdparty/ZWidget/CMakeLists.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Thirdparty/ZVulkan/CMakeLists.txt b/Thirdparty/ZVulkan/CMakeLists.txt index 18482714..47d77286 100644 --- a/Thirdparty/ZVulkan/CMakeLists.txt +++ b/Thirdparty/ZVulkan/CMakeLists.txt @@ -196,6 +196,6 @@ add_library(zvulkan STATIC ${ZVULKAN_SOURCES} ${ZVULKAN_INCLUDES} ${VULKAN_INCLU target_link_libraries(zvulkan ${ZVULKAN_LIBS}) set_target_properties(zvulkan PROPERTIES CXX_STANDARD 17) -if(MSVC) - set_property(TARGET zvulkan PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") -endif() +#if(MSVC) +# set_property(TARGET zvulkan PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +#endif() diff --git a/Thirdparty/ZWidget/CMakeLists.txt b/Thirdparty/ZWidget/CMakeLists.txt index 16d2b49c..ae50bf97 100644 --- a/Thirdparty/ZWidget/CMakeLists.txt +++ b/Thirdparty/ZWidget/CMakeLists.txt @@ -147,6 +147,6 @@ add_library(zwidget STATIC ${ZWIDGET_SOURCES} ${ZWIDGET_INCLUDES}) target_link_libraries(zwidget ${ZWIDGET_LIBS}) set_target_properties(zwidget PROPERTIES CXX_STANDARD 17) -if(MSVC) - set_property(TARGET zwidget PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") -endif() +#if(MSVC) +# set_property(TARGET zwidget PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +#endif()