diff options
| author | Gregor Jasny <gjasny@googlemail.com> | 2015-02-26 10:32:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-26 14:51:11 (GMT) |
| commit | ce935ebe50926bde199d86fbde4a78974a4043f9 (patch) | |
| tree | 407a8769628db398480ee33bd04be164d0cf3bfd /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 4817d2814a6d82e35590f9bfff2b088c95d45395 (diff) | |
| download | CMake-ce935ebe50926bde199d86fbde4a78974a4043f9.zip CMake-ce935ebe50926bde199d86fbde4a78974a4043f9.tar.gz CMake-ce935ebe50926bde199d86fbde4a78974a4043f9.tar.bz2 | |
cmake: Teach --build to honor CMAKE_VERBOSE_MAKEFILE for Ninja
The Ninja build system does not support a in-file verbositiy switch.
Instead teach 'cmake --build' to extract the CMAKE_VERBOSE_MAKEFILE
setting and pass it as an optional '-v' argument to Ninja. This can
serve as a reasonable fallback.
Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 3c07be1..69b1a9d 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -574,12 +574,18 @@ void cmGlobalNinjaGenerator const std::string& targetName, const std::string& /*config*/, bool /*fast*/, + bool verbose, std::vector<std::string> const& makeOptions) { makeCommand.push_back( this->SelectMakeProgram(makeProgram) ); + if(verbose) + { + makeCommand.push_back("-v"); + } + makeCommand.insert(makeCommand.end(), makeOptions.begin(), makeOptions.end()); if(!targetName.empty()) |