diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-04-29 15:00:00 (GMT) |
|---|---|---|
| committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-04-29 14:59:39 (GMT) |
| commit | 36aba01223cfb28ee574386cd91dbfccc4dc9359 (patch) | |
| tree | 7acf2fc54b9ddf7a5372cb088eb80cde6764408d /Source/cmQtAutoGenInitializer.cxx | |
| parent | d63c442a6bcec287afb32a88c80b68cb141f49f4 (diff) | |
| download | CMake-36aba01223cfb28ee574386cd91dbfccc4dc9359.zip CMake-36aba01223cfb28ee574386cd91dbfccc4dc9359.tar.gz CMake-36aba01223cfb28ee574386cd91dbfccc4dc9359.tar.bz2 | |
cmGeneratorTarget::GetProperty: return cmProp
Diffstat (limited to 'Source/cmQtAutoGenInitializer.cxx')
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index b0a7c30..fa523cc 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -339,21 +339,18 @@ bool cmQtAutoGenInitializer::InitCustomTargets() // Targets FOLDER { - cmProp prop = + cmProp folder = this->Makefile->GetState()->GetGlobalProperty("AUTOMOC_TARGETS_FOLDER"); - if (prop == nullptr) { - prop = this->Makefile->GetState()->GetGlobalProperty( + if (folder == nullptr) { + folder = this->Makefile->GetState()->GetGlobalProperty( "AUTOGEN_TARGETS_FOLDER"); } - const char* folder; // Inherit FOLDER property from target (#13688) - if (prop == nullptr) { + if (folder == nullptr) { folder = this->GenTarget->GetProperty("FOLDER"); - } else { - folder = prop->c_str(); } if (folder != nullptr) { - this->TargetsFolder = folder; + this->TargetsFolder = *folder; } } |