summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-06-23 11:56:32 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-06-23 11:57:33 (GMT)
commit22dbe547fb5bf5c2b8fe7e3abeb3eaa1a1487b04 (patch)
tree31535cde56dfca0ac6d234a031c61f176c87ea0b /Source
parent069e904337585db76f17d89f7418f293d970bade (diff)
parent7f78bc42cbbc6399d4baca21b49a3ac43edf638d (diff)
downloadCMake-22dbe547fb5bf5c2b8fe7e3abeb3eaa1a1487b04.zip
CMake-22dbe547fb5bf5c2b8fe7e3abeb3eaa1a1487b04.tar.gz
CMake-22dbe547fb5bf5c2b8fe7e3abeb3eaa1a1487b04.tar.bz2
Merge topic 'makefile-fix-verbose' into release-3.18
7f78bc42cb Makefile: Fix regression in .SILENT rule Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4928
Diffstat (limited to 'Source')
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 4545a8e..de1461a 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -713,9 +713,10 @@ void cmLocalUnixMakefileGenerator3::WriteSpecialTargetsTop(
// "VERBOSE=1" to be added as a make variable which will change the
// name of this special target. This gives a make-time choice to
// the user.
- this->WriteMakeRule(makefileStream,
- "Suppress display of executed commands.",
- "$(VERBOSE).SILENT", no_depends, no_commands, false);
+ // Write directly to the stream since WriteMakeRule escapes '$'.
+ makefileStream << "#Suppress display of executed commands.\n"
+ "$(VERBOSE).SILENT:\n"
+ "\n";
}
// Work-around for makes that drop rules that have no dependencies