diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-09 14:49:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-09 14:49:49 (GMT) |
| commit | 453df662bafe52ec87e0972323cf87ec737f3437 (patch) | |
| tree | cf5326c1c63bfee5079353699bcc09d982e4fe66 /Source/cmTargetPropertyComputer.cxx | |
| parent | 25085f41b20f7f5a5fb25e8ab683f77476f917a2 (diff) | |
| parent | 09cda9d5e7bb31f05177bdaf11d24aeaf85a8dd3 (diff) | |
| download | CMake-453df662bafe52ec87e0972323cf87ec737f3437.zip CMake-453df662bafe52ec87e0972323cf87ec737f3437.tar.gz CMake-453df662bafe52ec87e0972323cf87ec737f3437.tar.bz2 | |
Merge topic 'imported-interface-libname'
09cda9d5 Allow imported INTERFACE libraries to specify a link library name
1d1f1eeb cmTarget: Refactor GetMappedConfig to choose location property up front
479932fa cmTarget: Add comment clarifying interface library special case
925e4270 cmTarget: Clarify comments in GetMappedConfig
Diffstat (limited to 'Source/cmTargetPropertyComputer.cxx')
| -rw-r--r-- | Source/cmTargetPropertyComputer.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmTargetPropertyComputer.cxx b/Source/cmTargetPropertyComputer.cxx index 04931af..3a9bddb 100644 --- a/Source/cmTargetPropertyComputer.cxx +++ b/Source/cmTargetPropertyComputer.cxx @@ -65,7 +65,9 @@ bool cmTargetPropertyComputer::WhiteListedInterfaceProperty( return true; } - if (cmHasLiteralPrefix(prop, "MAP_IMPORTED_CONFIG_")) { + if (prop == "IMPORTED_CONFIGURATIONS" || prop == "IMPORTED_LIBNAME" || + cmHasLiteralPrefix(prop, "IMPORTED_LIBNAME_") || + cmHasLiteralPrefix(prop, "MAP_IMPORTED_CONFIG_")) { return true; } |