diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-02-08 19:10:22 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-02-08 19:10:22 (GMT) |
| commit | faa927e273e04b9aadc13fb1f2b8b307b7383cd2 (patch) | |
| tree | c6b6764c2d46c0a47e42cee2249391ca8f7a2747 /Source | |
| parent | 510fdcb18801076e2041eaae2941375eecc93ec2 (diff) | |
| download | CMake-faa927e273e04b9aadc13fb1f2b8b307b7383cd2.zip CMake-faa927e273e04b9aadc13fb1f2b8b307b7383cd2.tar.gz CMake-faa927e273e04b9aadc13fb1f2b8b307b7383cd2.tar.bz2 | |
Make sure INTERFACE properties work with OBJECT libraries.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmTarget.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 59afcb6..bf918d5 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -4781,6 +4781,10 @@ bool isLinkDependentProperty(cmTarget *tgt, const std::string &p, bool cmTarget::IsLinkInterfaceDependentBoolProperty(const std::string &p, const char *config) { + if (this->TargetTypeValue == OBJECT_LIBRARY) + { + return false; + } return (p == "POSITION_INDEPENDENT_CODE") || isLinkDependentProperty(this, p, "COMPATIBLE_INTERFACE_BOOL", config); @@ -4790,6 +4794,10 @@ bool cmTarget::IsLinkInterfaceDependentBoolProperty(const std::string &p, bool cmTarget::IsLinkInterfaceDependentStringProperty(const std::string &p, const char *config) { + if (this->TargetTypeValue == OBJECT_LIBRARY) + { + return false; + } return isLinkDependentProperty(this, p, "COMPATIBLE_INTERFACE_STRING", config); } |