Bläddra i källkod

Implement LINK_FLAGS_<CONFIG> in VS 10 generator

Add support for the per-config LINK_FLAGS property in VS 10.  This was
simply missing.
Brad King 15 år sedan
förälder
incheckning
159606c366
1 ändrade filer med 14 tillägg och 0 borttagningar
  1. 14 0
      Source/cmVisualStudio10TargetGenerator.cxx

+ 14 - 0
Source/cmVisualStudio10TargetGenerator.cxx

@@ -860,6 +860,13 @@ OutputLinkIncremental(std::string const& configName)
     flags += " ";
     flags += targetLinkFlags;
     }
+  std::string flagsProp = "LINK_FLAGS_";
+  flagsProp += CONFIG;
+  if(const char* flagsConfig = this->Target->GetProperty(flagsProp.c_str()))
+    {
+    flags += " ";
+    flags += flagsConfig;
+    }
   if(flags.find("INCREMENTAL:NO") != flags.npos)
     {
     incremental = "false";
@@ -1099,6 +1106,13 @@ void cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const&
     flags += " ";
     flags += targetLinkFlags;
     }
+  std::string flagsProp = "LINK_FLAGS_";
+  flagsProp += CONFIG;
+  if(const char* flagsConfig = this->Target->GetProperty(flagsProp.c_str()))
+    {
+    flags += " ";
+    flags += flagsConfig;
+    }
   cmVisualStudioGeneratorOptions
     linkOptions(this->LocalGenerator, 10,
                 cmVisualStudioGeneratorOptions::Linker,