diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-17 13:35:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-17 13:35:30 (GMT) |
| commit | 4a7eb0cdec943aa5d5e9b5f1de79fe02bd3a66e2 (patch) | |
| tree | 40f64abcd1a18d95871f907cbe250a9dc1959c5f /Source | |
| parent | 43b39b1c3657a9038bb10e1efef0192a45371050 (diff) | |
| parent | c903b5319bfcf383964c625bb84d7bc958aba2e9 (diff) | |
| download | CMake-4a7eb0cdec943aa5d5e9b5f1de79fe02bd3a66e2.zip CMake-4a7eb0cdec943aa5d5e9b5f1de79fe02bd3a66e2.tar.gz CMake-4a7eb0cdec943aa5d5e9b5f1de79fe02bd3a66e2.tar.bz2 | |
Merge branch 'CONFIG-LOCATION-CMP0026' into release
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 3fb79d8..0c89656 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -2730,6 +2730,21 @@ const char *cmTarget::GetProperty(const char* prop, this->GetLocation(configName.c_str()), cmProperty::TARGET); } + // Support "<CONFIG>_LOCATION". + if(cmHasLiteralSuffix(prop, "_LOCATION")) + { + std::string configName(prop, strlen(prop) - 9); + if(configName != "IMPORTED") + { + if (!this->HandleLocationPropertyPolicy()) + { + return 0; + } + this->Properties.SetProperty(prop, + this->GetLocation(configName.c_str()), + cmProperty::TARGET); + } + } } if(strcmp(prop,"INCLUDE_DIRECTORIES") == 0) { |