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

cmTarget: Inline GetLocation into deprecated callers.

Browse Source
This commit is contained in:
Stephen Kelly 2015-07-25 21:06:37 +02:00
parent 496f4cd07d
commit 5ab3a94651
1 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Source/cmTarget.cxx
View File

@ -2917,11 +2917,21 @@ const char *cmTarget::GetProperty(const std::string& prop,
// For an imported target this is the location of an arbitrary // For an imported target this is the location of an arbitrary
// available configuration. // available configuration.
// //
if(this->IsImported())
{
this->Properties.SetProperty(
propLOCATION, this->ImportedGetFullPath("", false).c_str());
}
else
{
// For a non-imported target this is deprecated because it // For a non-imported target this is deprecated because it
// cannot take into account the per-configuration name of the // cannot take into account the per-configuration name of the
// target because the configuration type may not be known at // target because the configuration type may not be known at
// CMake time. // CMake time.
this->Properties.SetProperty(propLOCATION, this->GetLocationForBuild()); this->Properties.SetProperty(
propLOCATION, this->GetLocationForBuild());
}
} }
// Support "LOCATION_<CONFIG>". // Support "LOCATION_<CONFIG>".
@ -2932,7 +2942,17 @@ const char *cmTarget::GetProperty(const std::string& prop,
return 0; return 0;
} }
const char* configName = prop.c_str() + 9; const char* configName = prop.c_str() + 9;
this->Properties.SetProperty(prop, this->GetLocation(configName));
if (this->IsImported())
{
this->Properties.SetProperty(
prop, this->ImportedGetFullPath(configName, false).c_str());
}
else
{
this->Properties.SetProperty(
prop, this->GetFullPath(configName, false).c_str());
}
} }
// Support "<CONFIG>_LOCATION". // Support "<CONFIG>_LOCATION".
else if(cmHasLiteralSuffix(prop, "_LOCATION")) else if(cmHasLiteralSuffix(prop, "_LOCATION"))
@ -2944,7 +2964,16 @@ const char *cmTarget::GetProperty(const std::string& prop,
{ {
return 0; return 0;
} }
this->Properties.SetProperty(prop, this->GetLocation(configName)); if (this->IsImported())
{
this->Properties.SetProperty(
prop, this->ImportedGetFullPath(configName, false).c_str());
}
else
{
this->Properties.SetProperty(
prop, this->GetFullPath(configName, false).c_str());
}
} }
} }
} }