From 1d80a77e55bd06e8d1e3d1aef9c6e7ed75f5bbba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Fri, 20 Jun 2025 19:06:01 -0400 Subject: [PATCH] build/cmake: avoid overriding "" for CMAKE_MSVC_RUNTIME_LIBRARY --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca6b09c4..c969904c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ option (OPENDHT_DOCUMENTATION "Create and install the HTML based API documentati # Build flags set (CMAKE_CXX_STANDARD 17) set (CMAKE_CXX_STANDARD_REQUIRED on) -if(MSVC AND NOT BUILD_SHARED_LIBS AND NOT CMAKE_MSVC_RUNTIME_LIBRARY) +if(MSVC AND NOT BUILD_SHARED_LIBS AND NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY) set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") endif() @@ -565,7 +565,7 @@ install (TARGETS opendht RUNTIME_DEPENDENCY_SET opendht_rdeps EXPORT opendht ) -if (WIN32 AND DEFINED CMAKE_TOOLCHAIN_FILE AND CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg") +if (WIN32) install(RUNTIME_DEPENDENCY_SET opendht_rdeps PRE_EXCLUDE_REGEXES "api-ms-win-.*\\.dll" -- GitLab