From a02ec931b6c40ce27609772742db34e8963e42a6 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 13 Mar 2020 16:56:41 +0100 Subject: [PATCH] CMake: Pass --verbose flag to ninja To allow seeing the exact compiler flags when build in Coin. We do the same for qmake builds. Change-Id: I8c43f35b95d722d914aaeaa8860720a3a0578737 Reviewed-by: Leander Beernaert Reviewed-by: Alexandru Croitor --- coin/instructions/cmake_build_and_upload_test_artifacts.yaml | 2 +- .../cmake_cross_compilation_module_build_instructions.yaml | 4 ++-- .../cmake_cross_compilation_qtbase_build_instructions.yaml | 4 ++-- coin/instructions/cmake_module_build_instructions.yaml | 2 +- coin/instructions/cmake_qtbase_build_instructions.yaml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/coin/instructions/cmake_build_and_upload_test_artifacts.yaml b/coin/instructions/cmake_build_and_upload_test_artifacts.yaml index b6e5dc99022..2df45ff07e5 100644 --- a/coin/instructions/cmake_build_and_upload_test_artifacts.yaml +++ b/coin/instructions/cmake_build_and_upload_test_artifacts.yaml @@ -13,7 +13,7 @@ instructions: variableValue: "-DQT_BUILD_STANDALONE_TESTS=ON -S {{.SourceDir}} -B ." - !include "{{qt/qtbase}}/call_cmake.yaml" - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel" + command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v" maxTimeInSeconds: 6000 maxTimeBetweenOutput: 1200 userMessageOnFailure: > diff --git a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml index c852737494c..c7249634131 100644 --- a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml +++ b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml @@ -19,7 +19,7 @@ instructions: variableValue: "-DBUILD_TESTING=OFF {{.SourceDir}}" - !include "{{qt/qtbase}}/call_host_cmake.yaml" - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel" + command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v" maxTimeInSeconds: 6000 maxTimeBetweenOutput: 1200 userMessageOnFailure: > @@ -51,7 +51,7 @@ instructions: variableValue: "-DBUILD_TESTING=OFF {{.SourceDir}}" - !include "{{qt/qtbase}}/call_target_cmake.yaml" - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel" + command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v" maxTimeInSeconds: 6000 maxTimeBetweenOutput: 1200 userMessageOnFailure: > diff --git a/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml index c4dda05c8b6..3ae63515a8d 100644 --- a/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml +++ b/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml @@ -22,7 +22,7 @@ instructions: userMessageOnFailure: > Failed to call cmake. - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel" + command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v" maxTimeInSeconds: 6000 maxTimeBetweenOutput: 1200 userMessageOnFailure: > @@ -57,7 +57,7 @@ instructions: userMessageOnFailure: > Failed to call cmake. - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel" + command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v" maxTimeInSeconds: 6000 maxTimeBetweenOutput: 1200 userMessageOnFailure: > diff --git a/coin/instructions/cmake_module_build_instructions.yaml b/coin/instructions/cmake_module_build_instructions.yaml index 7d8172cd53d..02c1e7b2e39 100644 --- a/coin/instructions/cmake_module_build_instructions.yaml +++ b/coin/instructions/cmake_module_build_instructions.yaml @@ -11,7 +11,7 @@ instructions: variableValue: "-DBUILD_TESTING=OFF {{.SourceDir}}" - !include "{{qt/qtbase}}/call_cmake.yaml" - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel" + command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v" maxTimeInSeconds: 6000 maxTimeBetweenOutput: 1200 userMessageOnFailure: > diff --git a/coin/instructions/cmake_qtbase_build_instructions.yaml b/coin/instructions/cmake_qtbase_build_instructions.yaml index a8ab72d3361..fe85d1681f2 100644 --- a/coin/instructions/cmake_qtbase_build_instructions.yaml +++ b/coin/instructions/cmake_qtbase_build_instructions.yaml @@ -14,7 +14,7 @@ instructions: userMessageOnFailure: > Failed to call cmake. - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel" + command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v" maxTimeInSeconds: 6000 maxTimeBetweenOutput: 1200 userMessageOnFailure: >