diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-28 13:03:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-06-28 13:03:00 (GMT) |
| commit | 059a6ca07a6f8bb4e101e9b269d6bdb4c0281018 (patch) | |
| tree | fcfbcb72fe086bede6fbd9923a7039f2522b1c43 /Source/cmGetPropertyCommand.cxx | |
| parent | 1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb (diff) | |
| parent | 2ca76a6651dd16586334067f6a41524a4015adc9 (diff) | |
| download | CMake-059a6ca07a6f8bb4e101e9b269d6bdb4c0281018.zip CMake-059a6ca07a6f8bb4e101e9b269d6bdb4c0281018.tar.gz CMake-059a6ca07a6f8bb4e101e9b269d6bdb4c0281018.tar.bz2 | |
Merge branch 'unknown-aliased-target' into compiler-features
Diffstat (limited to 'Source/cmGetPropertyCommand.cxx')
| -rw-r--r-- | Source/cmGetPropertyCommand.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx index 7c49c9a..854fdb8 100644 --- a/Source/cmGetPropertyCommand.cxx +++ b/Source/cmGetPropertyCommand.cxx @@ -248,15 +248,14 @@ bool cmGetPropertyCommand::HandleTargetMode() return false; } - if (this->PropertyName == "ALIASED_TARGET") { - if (this->Makefile->IsAlias(this->Name)) { - if (cmTarget* target = this->Makefile->FindTargetToUse(this->Name)) { + if (cmTarget* target = this->Makefile->FindTargetToUse(this->Name)) { + if (this->PropertyName == "ALIASED_TARGET") { + if (this->Makefile->IsAlias(this->Name)) { return this->StoreResult(target->GetName().c_str()); + } else { + return this->StoreResult((this->Variable + "-NOTFOUND").c_str()); } } - return this->StoreResult((this->Variable + "-NOTFOUND").c_str()); - } - if (cmTarget* target = this->Makefile->FindTargetToUse(this->Name)) { return this->StoreResult( target->GetProperty(this->PropertyName, this->Makefile)); } else { |