diff options
author | Ken Martin <ken.martin@kitware.com> | 2005-10-21 19:24:12 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2005-10-21 19:24:12 (GMT) |
commit | 52edb9c483f4f4c1b993031af85a46d520af52c6 (patch) | |
tree | 2fd08fa4a529f10eaf16fba342bbe33ac1f415be /Source | |
parent | 8a1f581bd3236dbd13023a75e73c2644b86abd07 (diff) | |
download | CMake-52edb9c483f4f4c1b993031af85a46d520af52c6.zip CMake-52edb9c483f4f4c1b993031af85a46d520af52c6.tar.gz CMake-52edb9c483f4f4c1b993031af85a46d520af52c6.tar.bz2 |
ENH: fix for bad placement of SILENT target
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index ef21a00..0e593c3 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1125,6 +1125,34 @@ cmLocalUnixMakefileGenerator3 no_depends, commands); } + + // 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 + // "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. + std::vector<std::string> commands; + commands.clear(); + std::vector<std::string> no_depends; + this->WriteMakeRule(makefileStream, + "Suppress display of executed commands.", + "$(VERBOSE).SILENT", + no_depends, + commands); + + // Special target to cleanup operation of make tool. + std::vector<std::string> depends; + this->WriteMakeRule(makefileStream, + "Disable implicit rules so canoncical targets will work.", + ".SUFFIXES", + depends, + commands); + // Add a fake suffix to keep HP happy. Must be max 32 chars for SGI make. + depends.push_back(".hpux_make_needs_suffix_list"); + this->WriteMakeRule(makefileStream, 0, + ".SUFFIXES", depends, commands); + } //---------------------------------------------------------------------------- @@ -1164,30 +1192,6 @@ cmLocalUnixMakefileGenerator3 std::vector<std::string> no_commands; - // 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 - // "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. - std::vector<std::string> no_depends; - this->WriteMakeRule(makefileStream, - "Suppress display of executed commands.", - "$(VERBOSE).SILENT", - no_depends, - no_commands); - - // Special target to cleanup operation of make tool. - std::vector<std::string> depends; - this->WriteMakeRule(makefileStream, - "Disable implicit rules so canoncical targets will work.", - ".SUFFIXES", - depends, - no_commands); - // Add a fake suffix to keep HP happy. Must be max 32 chars for SGI make. - depends.push_back(".hpux_make_needs_suffix_list"); - this->WriteMakeRule(makefileStream, 0, - ".SUFFIXES", depends, no_commands); } |