From 24624e02f1eac7ac59d80833bb6d74286a4aff36 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Mon, 28 Sep 2009 21:19:20 -0400 Subject: Make sure LINK_FLAGS are seen by generator, fix for part of bug#9613 --- Source/cmVisualStudio10TargetGenerator.cxx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index c110694..21c0095 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -798,6 +798,12 @@ OutputLinkIncremental(std::string const& configName) std::string flagVar = baseFlagVar + std::string("_") + CONFIG; flags += Target->GetMakefile()->GetRequiredDefinition(flagVar.c_str()); + } + const char* targetLinkFlags = this->Target->GetProperty("LINK_FLAGS"); + if(targetLinkFlags) + { + flags += " "; + flags += targetLinkFlags; } if(flags.find("INCREMENTAL:NO") != flags.npos) { -- cgit v0.12