mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-30 02:59:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmGlobalGenerator: Host the MakeSilentFlag.

Browse Source
This commit is contained in:
Stephen Kelly
2015-05-16 05:23:06 +02:00
parent 2047144f49
commit 684e5cefb2
6 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmLocalUnixMakefileGenerator3.cxx
+4 -4
View File
@@ -2140,10 +2140,12 @@ cmLocalUnixMakefileGenerator3
cmd += this->Convert(makefile,NONE,SHELL);
cmd += " ";
cmGlobalUnixMakefileGenerator3* gg =
static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
// Pass down verbosity level.
if(!this->GetMakeSilentFlag().empty())
if(!gg->MakeSilentFlag.empty())
{
cmd += this->GetMakeSilentFlag();
cmd += gg->MakeSilentFlag;
cmd += " ";
}
@@ -2151,8 +2153,6 @@ cmLocalUnixMakefileGenerator3
// sub-invoked makes via an environment variable. However, some
// makes do not support that, so you have to pass the flags
// explicitly.
cmGlobalUnixMakefileGenerator3* gg =
static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
if(gg->PassMakeflags)
{
cmd += "-$(MAKEFLAGS) ";