Skip to content
Snippets Groups Projects
Commit 1d80a77e authored by Adrien Béraud's avatar Adrien Béraud
Browse files

build/cmake: avoid overriding "" for CMAKE_MSVC_RUNTIME_LIBRARY

parent fb8734c4
No related branches found
No related tags found
No related merge requests found
...@@ -53,7 +53,7 @@ option (OPENDHT_DOCUMENTATION "Create and install the HTML based API documentati ...@@ -53,7 +53,7 @@ option (OPENDHT_DOCUMENTATION "Create and install the HTML based API documentati
# Build flags # Build flags
set (CMAKE_CXX_STANDARD 17) set (CMAKE_CXX_STANDARD 17)
set (CMAKE_CXX_STANDARD_REQUIRED on) 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>") set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
endif() endif()
...@@ -565,7 +565,7 @@ install (TARGETS opendht ...@@ -565,7 +565,7 @@ install (TARGETS opendht
RUNTIME_DEPENDENCY_SET opendht_rdeps RUNTIME_DEPENDENCY_SET opendht_rdeps
EXPORT opendht EXPORT opendht
) )
if (WIN32 AND DEFINED CMAKE_TOOLCHAIN_FILE AND CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg") if (WIN32)
install(RUNTIME_DEPENDENCY_SET opendht_rdeps install(RUNTIME_DEPENDENCY_SET opendht_rdeps
PRE_EXCLUDE_REGEXES PRE_EXCLUDE_REGEXES
"api-ms-win-.*\\.dll" "api-ms-win-.*\\.dll"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment