diff options
| author | Brad King <brad.king@kitware.com> | 2013-01-24 13:26:01 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-01-24 13:26:01 (GMT) |
| commit | 21fc6c46df7f2271d7baace04f239f031785b917 (patch) | |
| tree | d0d65b9da62ee894b2b14afc435280d4fe569061 /Source | |
| parent | 907f1e22271079eb2531c3e0b76b9c742c698197 (diff) | |
| parent | 6fbe3ce4ef1178cc4f2f14f281cd48ef82a11e03 (diff) | |
| download | CMake-21fc6c46df7f2271d7baace04f239f031785b917.zip CMake-21fc6c46df7f2271d7baace04f239f031785b917.tar.gz CMake-21fc6c46df7f2271d7baace04f239f031785b917.tar.bz2 | |
Merge topic 'fix-COMPATIBLE_INTERFACE-link-libraries'
6fbe3ce Exclude the LINK_LIBRARIES related properties from INTERFACE evaluation.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorExpressionDAGChecker.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx index 057f4c3..269211b 100644 --- a/Source/cmGeneratorExpressionDAGChecker.cxx +++ b/Source/cmGeneratorExpressionDAGChecker.cxx @@ -114,8 +114,14 @@ bool cmGeneratorExpressionDAGChecker::EvaluatingLinkLibraries() const cmGeneratorExpressionDAGChecker *parent = this->Parent; while (parent) { - parent = parent->Parent; top = parent; + parent = parent->Parent; } - return top->Property == "LINK_LIBRARIES"; + + const char *prop = top->Property.c_str(); + return (strcmp(prop, "LINK_LIBRARIES") == 0 + || strcmp(prop, "LINK_INTERFACE_LIBRARIES") == 0 + || strcmp(prop, "IMPORTED_LINK_INTERFACE_LIBRARIES") == 0 + || strncmp(prop, "LINK_INTERFACE_LIBRARIES_", 26) == 0 + || strncmp(prop, "IMPORTED_LINK_INTERFACE_LIBRARIES_", 35) == 0); } |