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/cmake.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/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 47be481..80e90a8 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -2789,11 +2789,16 @@ int cmake::Build(const std::string& dir, return 1; } projName = it.GetValue(); + bool verbose = false; + if(it.Find("CMAKE_VERBOSE_MAKEFILE")) + { + verbose = it.GetValueAsBool(); + } return gen->Build("", dir, projName, target, output, "", - config, clean, false, 0, + config, clean, false, verbose, 0, cmSystemTools::OUTPUT_PASSTHROUGH, nativeOptions); } |