Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Schmidt <dev@dominik-schmidt.de>2018-10-29 18:29:04 +0300
committerMichael Schuster <michael@schuster.ms>2020-08-20 19:50:05 +0300
commit13d4b9193524ea57e492f8e73ff80fbc2d145547 (patch)
tree4276490eb219c66eb4b9282c2fac807ddf2b68ca /shell_integration
parente4b53b12e1bf6db13b3e9f86b05d10c2fafe5d6c (diff)
Avoid warning because /MT overrides /MD flag
Signed-off-by: Michael Schuster <michael@schuster.ms>
Diffstat (limited to 'shell_integration')
-rw-r--r--shell_integration/windows/CMakeLists.txt5
-rw-r--r--shell_integration/windows/OCUtil/CMakeLists.txt5
2 files changed, 5 insertions, 5 deletions
diff --git a/shell_integration/windows/CMakeLists.txt b/shell_integration/windows/CMakeLists.txt
index b9c080b6e..2c004fd67 100644
--- a/shell_integration/windows/CMakeLists.txt
+++ b/shell_integration/windows/CMakeLists.txt
@@ -1,3 +1,8 @@
+# Use static runtime for all subdirectories
+foreach(buildType "" "_DEBUG" "_MINSIZEREL" "_RELEASE" "_RELWITHDEBINFO")
+ string(REPLACE "/MD" "/MT" "CMAKE_CXX_FLAGS${buildType}" "${CMAKE_CXX_FLAGS${buildType}}")
+endforeach()
+
add_subdirectory(OCContextMenu)
add_subdirectory(OCOverlays)
add_subdirectory(OCUtil)
diff --git a/shell_integration/windows/OCUtil/CMakeLists.txt b/shell_integration/windows/OCUtil/CMakeLists.txt
index eabb4c4a5..d353422f4 100644
--- a/shell_integration/windows/OCUtil/CMakeLists.txt
+++ b/shell_integration/windows/OCUtil/CMakeLists.txt
@@ -8,11 +8,6 @@ add_library(OCUtil STATIC
OCUtil.rc
)
-target_compile_options(OCUtil
- PUBLIC
- "/MT$<$<CONFIG:Debug>:d>"
-)
-
target_include_directories(OCUtil
PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}"