From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Mon, 29 Oct 2018 15:29:04 +0000 (-0700)
Subject: Avoid warning because /MT overrides /MD flag
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~22^2~216^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=13d4b9193524ea57e492f8e73ff80fbc2d145547;p=nextcloud-desktop.git

Avoid warning because /MT overrides /MD flag

Signed-off-by: Michael Schuster <michael@schuster.ms>
---

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}"