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/cmMakefileTargetGenerator.cxx | |
parent | cfc92b483fbd3695d4a67843977e709ba4d7ea47 (diff) | |
download | CMake-aba23c747b4a7fb342ae77d67b8b5cfbe9a67c8c.zip CMake-aba23c747b4a7fb342ae77d67b8b5cfbe9a67c8c.tar.gz CMake-aba23c747b4a7fb342ae77d67b8b5cfbe9a67c8c.tar.bz2 |
cmMakefile::GetProperty: return cmProp
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
-rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 4fb84ee..f687289 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -164,9 +164,9 @@ void cmMakefileTargetGenerator::WriteTargetBuildRules() }; // Look for additional files registered for cleaning in this directory. - if (const char* prop_value = + if (cmProp prop_value = this->Makefile->GetProperty("ADDITIONAL_MAKE_CLEAN_FILES")) { - std::vector<std::string> const files = evaluatedFiles(prop_value); + std::vector<std::string> const files = evaluatedFiles(*prop_value); this->CleanFiles.insert(files.begin(), files.end()); } @@ -183,8 +183,8 @@ void cmMakefileTargetGenerator::WriteTargetBuildRules() } // add custom commands to the clean rules? - const char* clean_no_custom = this->Makefile->GetProperty("CLEAN_NO_CUSTOM"); - bool clean = cmIsOff(clean_no_custom); + cmProp clean_no_custom = this->Makefile->GetProperty("CLEAN_NO_CUSTOM"); + bool clean = clean_no_custom ? cmIsOff(*clean_no_custom) : true; // First generate the object rule files. Save a list of all object // files for this target. |