diff options
author | Florian Maushart <FloriansGit@online.ms> | 2019-01-24 18:31:18 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2019-01-28 14:44:50 (GMT) |
commit | 439fe2e253410305ff7018416ff5ff26aa851d53 (patch) | |
tree | 5fd4875e35c4c737b40e08a658db0e935df09fc9 /Source/cmGlobalUnixMakefileGenerator3.cxx | |
parent | 638667efa2b0e5fff5c63bf936748a60b602ae90 (diff) | |
download | CMake-439fe2e253410305ff7018416ff5ff26aa851d53.zip CMake-439fe2e253410305ff7018416ff5ff26aa851d53.tar.gz CMake-439fe2e253410305ff7018416ff5ff26aa851d53.tar.bz2 |
cmake: Add options for verbose output to --build mode
While we already support `VERBOSE` environment variable and
`CMAKE_VERBOSE_MAKEFILE` cached variable, add `-v` and `--verbose`
command line options to be able to activate verbose output directly from
CMake's build tool mode command line.
Also make `msbuild` honor the verbosity setting. `xcodebuild` still
doesn't honor the verbosity setting as it will need a policy added
and reworking of cmGlobalGenerator and cmsys to support
multiple command invocation.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
-rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 9fc60e7..6989b51 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -493,7 +493,7 @@ void cmGlobalUnixMakefileGenerator3::GenerateBuildCommand( GeneratedMakeCommand& makeCommand, const std::string& makeProgram, const std::string& /*projectName*/, const std::string& /*projectDir*/, const std::string& targetName, const std::string& /*config*/, bool fast, - int jobs, bool /*verbose*/, std::vector<std::string> const& makeOptions) + int jobs, bool verbose, std::vector<std::string> const& makeOptions) { std::unique_ptr<cmMakefile> mfu; cmMakefile* mf; @@ -510,6 +510,13 @@ void cmGlobalUnixMakefileGenerator3::GenerateBuildCommand( mf = mfu.get(); } + // Make it possible to set verbosity also from command line + if (verbose) { + makeCommand.add(cmSystemTools::GetCMakeCommand()); + makeCommand.add("-E"); + makeCommand.add("env"); + makeCommand.add("VERBOSE=1"); + } makeCommand.add(this->SelectMakeProgram(makeProgram)); if (jobs != cmake::NO_BUILD_PARALLEL_LEVEL) { |