summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalUnixMakefileGenerator3.h
diff options
context:
space:
mode:
authorSebastian Holtermann <sebholt@xwmw.org>2019-05-17 15:15:50 (GMT)
committerSebastian Holtermann <sebholt@xwmw.org>2019-05-18 10:27:24 (GMT)
commit1ded3599d698c1bfa0243d58ece8b619d2900a17 (patch)
tree1de9ca901ba990724a72eeb50a7034c9638bed8b /Source/cmGlobalUnixMakefileGenerator3.h
parent827da1119ef2d0978dd6dbc58aeee803e43b2455 (diff)
downloadCMake-1ded3599d698c1bfa0243d58ece8b619d2900a17.zip
CMake-1ded3599d698c1bfa0243d58ece8b619d2900a17.tar.gz
CMake-1ded3599d698c1bfa0243d58ece8b619d2900a17.tar.bz2
Makefiles: Process ADDTIONAL_CLEAN_FILES dir prop at directory level
In the "Unix Makefiles" generator, the `ADDTIONAL_CLEAN_FILES` directory property was evaluated on a per target basis. This had two drawbacks: - per directory clean files were repeated in every target clean script - per directory clean files weren't removed in directories without targets (issue #8164) This patch moves the `ADDTIONAL_CLEAN_FILES` directory property processing from the target to the directory level clean target. Fixes: #8164 "ADDITIONAL_CLEAN_FILES directory property not respected if no target present in directory"
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.h')
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index e919d38..287472c 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -165,7 +165,8 @@ protected:
void WriteDirectoryRule2(std::ostream& ruleFileStream,
cmLocalUnixMakefileGenerator3* lg, const char* pass,
- bool check_all, bool check_relink);
+ bool check_all, bool check_relink,
+ std::vector<std::string> const& commands = {});
void WriteDirectoryRules2(std::ostream& ruleFileStream,
cmLocalUnixMakefileGenerator3* lg);