diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-04-01 13:00:00 (GMT) |
|---|---|---|
| committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-04-01 14:56:34 (GMT) |
| commit | aba23c747b4a7fb342ae77d67b8b5cfbe9a67c8c (patch) | |
| tree | 583a67deafe91340834232335a5e318039e2f0ff /Source/cmGlobalGenerator.cxx | |
| parent | cfc92b483fbd3695d4a67843977e709ba4d7ea47 (diff) | |
| download | CMake-aba23c747b4a7fb342ae77d67b8b5cfbe9a67c8c.zip CMake-aba23c747b4a7fb342ae77d67b8b5cfbe9a67c8c.tar.gz CMake-aba23c747b4a7fb342ae77d67b8b5cfbe9a67c8c.tar.bz2 | |
cmMakefile::GetProperty: return cmProp
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 152e294..ccbbf53 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1678,8 +1678,8 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo() for (std::string const& c : configs) { std::string defPropName = cmStrCat("COMPILE_DEFINITIONS_", cmSystemTools::UpperCase(c)); - if (const char* val = mf->GetProperty(defPropName)) { - t->AppendProperty(defPropName, val); + if (cmProp val = mf->GetProperty(defPropName)) { + t->AppendProperty(defPropName, *val); } } } @@ -3034,7 +3034,7 @@ void cmGlobalGenerator::WriteSummary(cmGeneratorTarget* target) #ifndef CMAKE_BOOTSTRAP // Check whether labels are enabled for this target. const char* targetLabels = target->GetProperty("LABELS"); - const char* directoryLabels = + cmProp directoryLabels = target->Target->GetMakefile()->GetProperty("LABELS"); const char* cmakeDirectoryLabels = target->Target->GetMakefile()->GetDefinition("CMAKE_DIRECTORY_LABELS"); @@ -3068,7 +3068,7 @@ void cmGlobalGenerator::WriteSummary(cmGeneratorTarget* target) std::vector<std::string> cmakeDirectoryLabelsList; if (directoryLabels) { - cmExpandList(directoryLabels, directoryLabelsList); + cmExpandList(*directoryLabels, directoryLabelsList); } if (cmakeDirectoryLabels) { |