diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-02-07 12:13:44 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-02-07 15:21:09 (GMT) |
| commit | 1fb545ad3a8f6d263c9f01300bce978e81b6fe8c (patch) | |
| tree | 7198441143f48dd813f085aca278417305582b60 | |
| parent | 57175d559ee2bdd56c360a3b45aacf13b15b9270 (diff) | |
| download | CMake-1fb545ad3a8f6d263c9f01300bce978e81b6fe8c.zip CMake-1fb545ad3a8f6d263c9f01300bce978e81b6fe8c.tar.gz CMake-1fb545ad3a8f6d263c9f01300bce978e81b6fe8c.tar.bz2 | |
Move a special case for PIC from the genex to the cmTarget code.
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index 0ac1e76..f601ea3 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -460,12 +460,6 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode { 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, context->Config)) { diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index b92bf77..6f197b8 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -4797,7 +4797,8 @@ bool isLinkDependentProperty(cmTarget *tgt, const std::string &p, bool cmTarget::IsLinkInterfaceDependentBoolProperty(const std::string &p, const char *config) { - return isLinkDependentProperty(this, p, "COMPATIBLE_INTERFACE_BOOL", + return (p == "POSITION_INDEPENDENT_CODE") || + isLinkDependentProperty(this, p, "COMPATIBLE_INTERFACE_BOOL", config); } |