summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Holtermann <sebholt@xwmw.org>2019-08-26 09:47:27 (GMT)
committerBrad King <brad.king@kitware.com>2019-08-26 13:31:03 (GMT)
commit3ed8cffe73755f5267340d5b0abe8cb4e108e822 (patch)
treebf6f02393f1abcb6f48610f0c0cab1cdacc2db38
parent40bbe50e23c06232ccf1c49589dde5dd84e1ac31 (diff)
downloadCMake-3ed8cffe73755f5267340d5b0abe8cb4e108e822.zip
CMake-3ed8cffe73755f5267340d5b0abe8cb4e108e822.tar.gz
CMake-3ed8cffe73755f5267340d5b0abe8cb4e108e822.tar.bz2
Ninja: Add support for ADDITIONAL_CLEAN_FILES in custom targets
This enables the support for `ADDITIONAL_CLEAN_FILES` in custom targets using the ninja generator. Fixes: #19641
-rw-r--r--Source/cmNinjaNormalTargetGenerator.cxx1
-rw-r--r--Source/cmNinjaUtilityTargetGenerator.cxx3
2 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index f65abc8..b7b822a 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -85,6 +85,7 @@ void cmNinjaNormalTargetGenerator::Generate()
this->WriteLinkStatement();
}
+ // Find ADDITIONAL_CLEAN_FILES
this->AdditionalCleanFiles();
}
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index 1225cbd..e774b53 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -135,6 +135,9 @@ void cmNinjaUtilityTargetGenerator::Generate()
gg->WriteBuild(this->GetBuildFileStream(), phonyBuild);
}
+ // Find ADDITIONAL_CLEAN_FILES
+ this->AdditionalCleanFiles();
+
// Add an alias for the logical target name regardless of what directory
// contains it. Skip this for GLOBAL_TARGET because they are meant to
// be per-directory and have one at the top-level anyway.