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

Ninja: Fix Intel interprocedural optimization with static libraries

Browse Source 
Teach cmGeneratorTarget::GetCreateRuleVariable about the IPO variant.
Return the static library IPO rule when the feature is enabled.
This commit is contained in:
Brad King 2014-05-21 09:40:30 -04:00
parent 5d12b87b9d
commit b6e2e0d194
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmGeneratorTarget.cxx
View File

@ -945,12 +945,24 @@ void cmGeneratorTarget::GetAppleArchs(const std::string& config,
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::string std::string
cmGeneratorTarget::GetCreateRuleVariable(std::string const& lang, cmGeneratorTarget::GetCreateRuleVariable(std::string const& lang,
std::string const&) const std::string const& config) const
{ {
switch(this->GetType()) switch(this->GetType())
{ {
case cmTarget::STATIC_LIBRARY: case cmTarget::STATIC_LIBRARY:
return "CMAKE_" + lang + "_CREATE_STATIC_LIBRARY"; {
std::string var = "CMAKE_" + lang + "_CREATE_STATIC_LIBRARY";
if(this->Target->GetFeatureAsBool(
"INTERPROCEDURAL_OPTIMIZATION", config))
{
std::string varIPO = var + "_IPO";
if(this->Makefile->GetDefinition(varIPO))
{
return varIPO;
}
}
return var;
}
case cmTarget::SHARED_LIBRARY: case cmTarget::SHARED_LIBRARY:
return "CMAKE_" + lang + "_CREATE_SHARED_LIBRARY"; return "CMAKE_" + lang + "_CREATE_SHARED_LIBRARY";
case cmTarget::MODULE_LIBRARY: case cmTarget::MODULE_LIBRARY: