From f35d1efab23993a48d0a3e036f41387ba35ee522 Mon Sep 17 00:00:00 2001 From: Vasilii Rogin Date: Sun, 27 Apr 2025 18:03:17 +0300 Subject: [PATCH] Revert "Set MSVC_RUNTIME_LIBRARY in the makefile" This reverts commit 42a6a16f7312853d8e28f807dd1246016b516ccc. --- CMakeLists.txt | 7 ------- CMakePresets.json | 4 +++- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d8ffcd20..6b34285a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,12 +28,6 @@ else() add_executable(${EXECUTABLE_NAME} WIN32 MACOSX_BUNDLE) endif() -if(WIN32) - set_target_properties(${EXECUTABLE_NAME} PROPERTIES - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>" - ) -endif() - # Git Info include("cmake/gitver.cmake") @@ -329,7 +323,6 @@ if(WIN32) ) endif() - if(APPLE) if(IOS) set(RESOURCES diff --git a/CMakePresets.json b/CMakePresets.json index 7cce8781..9448f3ff 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -33,7 +33,8 @@ "cacheVariables": { "CMAKE_GENERATOR_TOOLSET": "v141_xp", "CMAKE_C_FLAGS": "/D_WIN32_WINNT=0x0501", - "CMAKE_CXX_FLAGS": "/D_WIN32_WINNT=0x0501 /D_STATIC_CPPLIB" + "CMAKE_CXX_FLAGS": "/D_WIN32_WINNT=0x0501 /D_STATIC_CPPLIB", + "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$:Debug>" } }, { @@ -44,6 +45,7 @@ "generator": "Visual Studio 16 2019", "architecture": "x64", "cacheVariables": { + "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$:Debug>" } }, {