diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-11-12 15:02:22 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-11-15 11:53:47 +0100 |
| commit | 9594789fcc58cb250900c935e1adb4b2ce9ed8b6 (patch) | |
| tree | 3613bf68ba67f43577a0d5f5197797038171fbc1 /build_scripts/main.py | |
| parent | a421aab61ad03afa595aa0ba7e53d84b1edbe892 (diff) | |
setup: Make ninja output the commands it runs in a verbose build
Verbose build output worked when using the Makefiles generator because
we set CMAKE_VERBOSE_MAKEFILE to ON, but that does not affect ninja.
For ninja we need to explicitly pass -v on the command line.
The verbose ninja output is useful when debugging build issues in the
CI (which uses verbose build).
Pick-to: 6.2
Change-Id: Ib1532db0225744184d89bf796c4b3a6a40d718ca
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'build_scripts/main.py')
| -rw-r--r-- | build_scripts/main.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index de4e97524..7b913ee73 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -909,6 +909,8 @@ class PysideBuild(_build, DistUtilsCommandMixin): cmd_make = [self.make_path] if OPTION["JOBS"]: cmd_make.append(OPTION["JOBS"]) + if OPTION["VERBOSE_BUILD"] and self.make_generator == "Ninja": + cmd_make.append("-v") if run_process(cmd_make) != 0: raise DistutilsSetupError(f"Error compiling {extension}") @@ -926,7 +928,10 @@ class PysideBuild(_build, DistUtilsCommandMixin): import sphinx log.info("Generating Shiboken documentation") - if run_process([self.make_path, "doc"]) != 0: + make_doc_cmd = [self.make_path, "doc"] + if OPTION["VERBOSE_BUILD"] and self.make_generator == "Ninja": + make_doc_cmd.append("-v") + if run_process(make_doc_cmd) != 0: raise DistutilsSetupError("Error generating documentation " f"for {extension}") except ImportError: |