diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-27 11:35:03 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-27 11:35:12 (GMT) |
| commit | 0af3a9b7553f9dadd49eafa71e706bbc9007af23 (patch) | |
| tree | b0e78867039b07af2e971dc2f107958fbafcbc83 /Source | |
| parent | d14626afe5154ab03297d4fb8a4d00ca05db3a1d (diff) | |
| parent | d6d9da5178e944e66330156a1292e621235eda05 (diff) | |
| download | CMake-0af3a9b7553f9dadd49eafa71e706bbc9007af23.zip CMake-0af3a9b7553f9dadd49eafa71e706bbc9007af23.tar.gz CMake-0af3a9b7553f9dadd49eafa71e706bbc9007af23.tar.bz2 | |
Merge topic 'make-nested-silent' into release-3.17
d6d9da5178 Makefiles: Fix silencing of nested calls for GNU make 4.3
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4515
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 63c6680..24a6351 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -728,6 +728,10 @@ void cmLocalUnixMakefileGenerator3::WriteSpecialTargetsTop( ; /* clang-format on */ } else { + makefileStream << "# Command-line flag to silence nested $(MAKE).\n" + "$(VERBOSE)MAKESILENT = -s\n" + "\n"; + // Write special target to silence make output. This must be after // the default target in case VERBOSE is set (which changes the // name). The setting of CMAKE_VERBOSE_MAKEFILE to ON will cause a @@ -1925,7 +1929,7 @@ std::string cmLocalUnixMakefileGenerator3::GetRecursiveMakeCall( { // Call make on the given file. std::string cmd = cmStrCat( - "$(MAKE) -f ", + "$(MAKE) $(MAKESILENT) -f ", this->ConvertToOutputFormat(makefile, cmOutputConverter::SHELL), ' '); cmGlobalUnixMakefileGenerator3* gg = |