diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-27 14:11:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-08-27 14:11:06 (GMT) |
| commit | b0566f62eb9de7d1baaf3d3d4bcdaea547e8ca86 (patch) | |
| tree | d47fcb88b45ca3b08768c7654164ffb93925261f /Source | |
| parent | 290ab79f61508bac4ce44b15d2b3e661c4c32c32 (diff) | |
| parent | d040f3f1eee237ca8cb35d7055a348a7c06fa572 (diff) | |
| download | CMake-b0566f62eb9de7d1baaf3d3d4bcdaea547e8ca86.zip CMake-b0566f62eb9de7d1baaf3d3d4bcdaea547e8ca86.tar.gz CMake-b0566f62eb9de7d1baaf3d3d4bcdaea547e8ca86.tar.bz2 | |
Merge branch 'ninja_additional_clean_files_custom_target' into release-3.15
Merge-request: !3739
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 1 | ||||
| -rw-r--r-- | Source/cmNinjaUtilityTargetGenerator.cxx | 3 |
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. |