diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-01 16:25:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-01 16:25:13 (GMT) |
| commit | 62d65286e71c58c88646f2f851edf7669fd40a41 (patch) | |
| tree | e2ac0c77e9ba02a7fd80f1963617a5b5f00a22e9 /Source/cmGlobalUnixMakefileGenerator3.h | |
| parent | ec16afc9e8aed8aebd387c416af5b5eef4ad337a (diff) | |
| parent | 8a15e75fe351579314f92dd9d9e2c6faeac5ad71 (diff) | |
| download | CMake-62d65286e71c58c88646f2f851edf7669fd40a41.zip CMake-62d65286e71c58c88646f2f851edf7669fd40a41.tar.gz CMake-62d65286e71c58c88646f2f851edf7669fd40a41.tar.bz2 | |
Merge topic 'fix-EXCLUDE_FROM_ALL-subdir-all'
8a15e75fe3 Tests: Cover EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all
7420843370 Makefiles: Fix EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all
d713bcb642 Ninja: Factor out per-dir "all" target computation into common generator
a75586c775 Ninja: Simplify top-level "all" target generation
a49cd4d1a7 Ninja: Fix EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all
0733a94f64 Ninja,Makefile: Fix subdir "all" with nested EXCLUDE_FROM_ALL subdir
11fb377eb9 cmLocalUnixMakefileGenerator3: Mark GetRelativeTargetDirectory const
be7857f40d cmLocalCommonGenerator: Mark GetConfigName as const
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3869
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.h')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h index 6a39509..79db30e 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.h +++ b/Source/cmGlobalUnixMakefileGenerator3.h @@ -164,11 +164,11 @@ protected: cmLocalUnixMakefileGenerator3*); void WriteDirectoryRule2(std::ostream& ruleFileStream, - cmLocalUnixMakefileGenerator3* lg, const char* pass, + DirectoryTarget const& dt, const char* pass, bool check_all, bool check_relink, std::vector<std::string> const& commands = {}); void WriteDirectoryRules2(std::ostream& ruleFileStream, - cmLocalUnixMakefileGenerator3* lg); + DirectoryTarget const& dt); void AppendGlobalTargetDepends(std::vector<std::string>& depends, cmGeneratorTarget* target); |