diff options
author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-03-22 03:00:00 -0400 |
---|---|---|
committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-03-25 09:10:46 -0400 |
commit | c84cf42897e4d95706d4f750c2ad085c84a259f2 (patch) | |
tree | 980169e295b16dbc56fe3577b48913fd4a9c2e8a /Source/cmQtAutoGenInitializer.cxx | |
parent | d13d5c11cf8b5878c5e63b067e73a2175f01d93f (diff) | |
download | cmake-c84cf42897e4d95706d4f750c2ad085c84a259f2.tar.gz |
cmState::GetGlobalProperty: return cmProp
Diffstat (limited to 'Source/cmQtAutoGenInitializer.cxx')
-rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index 629367d8c6..dddba0a532 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -339,15 +339,18 @@ bool cmQtAutoGenInitializer::InitCustomTargets() // Targets FOLDER { - const char* folder = + cmProp prop = this->Makefile->GetState()->GetGlobalProperty("AUTOMOC_TARGETS_FOLDER"); - if (folder == nullptr) { - folder = this->Makefile->GetState()->GetGlobalProperty( + if (prop == nullptr) { + prop = this->Makefile->GetState()->GetGlobalProperty( "AUTOGEN_TARGETS_FOLDER"); } + const char* folder; // Inherit FOLDER property from target (#13688) - if (folder == nullptr) { + if (prop == nullptr) { folder = this->GenTarget->GetProperty("FOLDER"); + } else { + folder = prop->c_str(); } if (folder != nullptr) { this->TargetsFolder = folder; @@ -1604,10 +1607,9 @@ void cmQtAutoGenInitializer::AddToSourceGroup(std::string const& fileName, cmStrCat(genNameUpper, "_SOURCE_GROUP"), "AUTOGEN_SOURCE_GROUP" }; for (std::string const& prop : props) { - const char* propName = - this->Makefile->GetState()->GetGlobalProperty(prop); - if ((propName != nullptr) && (*propName != '\0')) { - groupName = propName; + cmProp propName = this->Makefile->GetState()->GetGlobalProperty(prop); + if (propName && !propName->empty()) { + groupName = *propName; property = prop; break; } |