kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement LINK_FLAGS_<CONFIG> in VS 10 generator 

Add support for the per-config LINK_FLAGS property in VS 10.  This was
simply missing.
This commit is contained in:
Brad King 2010-05-28 11:00:31 -04:00
parent 7458d465dd
commit 159606c366
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmVisualStudio10TargetGenerator.cxx
View File

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