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

Makefiles: Move ADDITIONAL_MAKE_CLEAN_FILES evaluation to lambda

Browse Source
This commit is contained in:
Sebastian Holtermann
2019-05-13 19:43:00 +02:00
parent 7c8c18b1e6
commit 43640fc80a
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmMakefileTargetGenerator.cxx
+16 -10
View File
@@ -147,23 +147,29 @@ void cmMakefileTargetGenerator::CreateRuleFile()
void cmMakefileTargetGenerator::WriteTargetBuildRules()
{
// -- Write the custom commands for this target
const std::string& config =
this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
// write the custom commands for this target
// Look for files registered for cleaning in this directory.
if (const char* additional_clean_files =
this->Makefile->GetProperty("ADDITIONAL_MAKE_CLEAN_FILES")) {
// Evaluates generator expressions and expands prop_value
auto evaluatedFiles =
[this, &config](const char* prop_value) -> std::vector<std::string> {
std::vector<std::string> files;
cmGeneratorExpression ge;
std::unique_ptr<cmCompiledGeneratorExpression> cge =
ge.Parse(additional_clean_files);
std::vector<std::string> additionalFiles;
std::unique_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(prop_value);
cmSystemTools::ExpandListArgument(
cge->Evaluate(this->LocalGenerator, config, false, this->GeneratorTarget,
nullptr, nullptr),
additionalFiles);
this->CleanFiles.insert(additionalFiles.begin(), additionalFiles.end());
files);
return files;
};
// Look for additional files registered for cleaning in this directory.
if (const char* prop_value =
this->Makefile->GetProperty("ADDITIONAL_MAKE_CLEAN_FILES")) {
std::vector<std::string> const files = evaluatedFiles(prop_value);
this->CleanFiles.insert(files.begin(), files.end());
}
// add custom commands to the clean rules?