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

Move a special case for PIC from the genex to the cmTarget code.

Browse Source
This commit is contained in:
Stephen Kelly 2013-02-07 13:13:44 +01:00
parent 57175d559e
commit 1fb545ad3a
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGeneratorExpressionEvaluator.cxx
View File

@ -460,12 +460,6 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
{ {
return std::string(); return std::string();
} }
if (propertyName == "POSITION_INDEPENDENT_CODE")
{
context->HadContextSensitiveCondition = true;
return target->GetLinkInterfaceDependentBoolProperty(
"POSITION_INDEPENDENT_CODE", context->Config) ? "1" : "0";
}
if (target->IsLinkInterfaceDependentBoolProperty(propertyName, if (target->IsLinkInterfaceDependentBoolProperty(propertyName,
context->Config)) context->Config))
{ {

3
Source/cmTarget.cxx
View File

@ -4797,7 +4797,8 @@ bool isLinkDependentProperty(cmTarget *tgt, const std::string &p,
bool cmTarget::IsLinkInterfaceDependentBoolProperty(const std::string &p, bool cmTarget::IsLinkInterfaceDependentBoolProperty(const std::string &p,
const char *config) const char *config)
{ {
return isLinkDependentProperty(this, p, "COMPATIBLE_INTERFACE_BOOL", return (p == "POSITION_INDEPENDENT_CODE") ||
isLinkDependentProperty(this, p, "COMPATIBLE_INTERFACE_BOOL",
config); config);
} }