From d244f2cad3fea2884eb706e2761189ea9644b70b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20St=C3=BCrmer?= <michael.stuermer@schaeffler.com>
Date: Fri, 27 Apr 2018 07:31:03 +0200
Subject: cmVisualStudio10TargetGenerator: add handling of manual /clr setting

---
 Source/cmVisualStudio10TargetGenerator.cxx | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 95e52e6..3fb0e10 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3813,6 +3813,16 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences(Elem& e0)
       // 'ReferenceOutputAssembly' to false.
       auto referenceNotManaged =
         dt->GetManagedType("") < cmGeneratorTarget::ManagedType::Mixed;
+      // Workaround to check for manually set /clr flags.
+      if (referenceNotManaged) {
+        if (const auto* flags = dt->GetProperty("COMPILE_OPTIONS")) {
+          std::string flagsStr = flags;
+          if (flagsStr.find("clr") != std::string::npos) {
+            // There is a warning already issued when building the flags.
+            referenceNotManaged = false;
+          }
+        }
+      }
       if (referenceNotManaged) {
         e2.Element("ReferenceOutputAssembly", "false");
       }
-- 
cgit v0.12