diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-17 13:49:56 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-17 13:49:56 (GMT) |
| commit | 6aaaa6d0bd584b05a1492b3861e3589f5ffe544d (patch) | |
| tree | a9e3478af0162ffda2a7b36f9fe82882a48c3dec /Source | |
| parent | 5a21cbc96bb5905638cca978f5996c60b7f940fa (diff) | |
| parent | ea17a03be5794a934991b1f958cab12b7011da74 (diff) | |
| download | CMake-6aaaa6d0bd584b05a1492b3861e3589f5ffe544d.zip CMake-6aaaa6d0bd584b05a1492b3861e3589f5ffe544d.tar.gz CMake-6aaaa6d0bd584b05a1492b3861e3589f5ffe544d.tar.bz2 | |
Merge topic 'CONFIG-LOCATION-CMP0026'
ea17a03b cmTarget: Port <CONFIG>_LOCATION support to updated string APIs
6e466c6f Merge branch 'master' into CONFIG-LOCATION-CMP0026
c903b531 cmTarget: Restore <CONFIG>_LOCATION to CMP0026 OLD behavior (#14808)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmTarget.cxx | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index ca34aea..17c8a4d 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -2670,6 +2670,21 @@ const char *cmTarget::GetProperty(const std::string& prop, this->GetLocation(configName), cmProperty::TARGET); } + // Support "<CONFIG>_LOCATION". + if(cmHasLiteralSuffix(prop, "_LOCATION")) + { + std::string configName(prop.c_str(), prop.size() - 9); + if(configName != "IMPORTED") + { + if (!this->HandleLocationPropertyPolicy()) + { + return 0; + } + this->Properties.SetProperty(prop, + this->GetLocation(configName), + cmProperty::TARGET); + } + } } if(prop == "INCLUDE_DIRECTORIES") { |