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/cmGlobalGenerator.h | |
| 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/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 08f061a..5b9ddee 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -134,7 +134,7 @@ public: const std::string& projectName, const std::string& targetName, std::string& output, const std::string& makeProgram, const std::string& config, - bool clean, bool fast, + bool clean, bool fast, bool verbose, double timeout, cmSystemTools::OutputOption outputflag=cmSystemTools::OUTPUT_NONE, std::vector<std::string> const& nativeOptions = @@ -144,7 +144,8 @@ public: std::vector<std::string>& makeCommand, const std::string& makeProgram, const std::string& projectName, const std::string& projectDir, - const std::string& targetName, const std::string& config, bool fast, + const std::string& targetName, const std::string& config, + bool fast, bool verbose, std::vector<std::string> const& makeOptions = std::vector<std::string>() ); |