diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-09-29 01:19:20 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-09-29 01:19:20 (GMT) |
| commit | 24624e02f1eac7ac59d80833bb6d74286a4aff36 (patch) | |
| tree | 1495c9f9122fd32ee1a874523b22d2c40f549155 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 23dbb3b8037db328bc02abd4f083e7e5eaec68fc (diff) | |
| download | CMake-24624e02f1eac7ac59d80833bb6d74286a4aff36.zip CMake-24624e02f1eac7ac59d80833bb6d74286a4aff36.tar.gz CMake-24624e02f1eac7ac59d80833bb6d74286a4aff36.tar.bz2 | |
Make sure LINK_FLAGS are seen by generator, fix for part of bug#9613
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
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) { |