mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 13:19:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmMakefile::GetProperty: return cmProp

Browse Source
This commit is contained in:
Vitaly Stakhovsky
2020-04-01 09:00:00 -04:00
parent cfc92b483f
commit aba23c747b
17 changed files with 104 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmMakefileTargetGenerator.cxx
+4 -4
View File
@@ -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.