diff options
| author | Brad King <brad.king@kitware.com> | 2010-05-28 15:00:31 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-05-28 15:01:40 (GMT) |
| commit | 159606c3667e006bba59490c2cae82871f25d773 (patch) | |
| tree | dd49aeaf9881ce470fa857293864ff70749a027a | |
| parent | 7458d465dde88a5e85b51d32b7b37f9dcfb9d216 (diff) | |
| download | CMake-159606c3667e006bba59490c2cae82871f25d773.zip CMake-159606c3667e006bba59490c2cae82871f25d773.tar.gz CMake-159606c3667e006bba59490c2cae82871f25d773.tar.bz2 | |
Implement LINK_FLAGS_<CONFIG> in VS 10 generator
Add support for the per-config LINK_FLAGS property in VS 10. This was
simply missing.
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 9f64473..13bbc74 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/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, |