1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Use CMAKE_AUTOGEN_VERBOSE to see moc invocations

Browse Source 
In qmake builds we can see the moc invocations, whereas in CMake builds
by default we don't.
Modify the Coin instructions to pass the CMAKE_AUTOGEN_VERBOSE cache
variable so that AUTOMOC prints the moc invocations.

Change-Id: I50be13224839fbbdece3c9e8a4935a72aba91a8e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Toni Saario 2020-05-27 16:24:24 +03:00 committed by Alexandru Croitor
parent 684fea1314
commit 716e41e86f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coin/instructions/cmake_build_and_upload_test_artifacts.yaml
View File

@ -10,7 +10,7 @@ instructions:
directory: "{{.BuildDir}}" directory: "{{.BuildDir}}"
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: COIN_CMAKE_ARGS variableName: COIN_CMAKE_ARGS
variableValue: "-DQT_BUILD_STANDALONE_TESTS=ON -S {{.SourceDir}} -B ." variableValue: "-DQT_BUILD_STANDALONE_TESTS=ON -DCMAKE_AUTOGEN_VERBOSE=ON -S {{.SourceDir}} -B ."
- !include "{{qt/qtbase}}/call_cmake_for_standalone_tests.yaml" - !include "{{qt/qtbase}}/call_cmake_for_standalone_tests.yaml"
- type: ExecuteCommand - type: ExecuteCommand
command: "{{.Env.TESTS_ENV_PREFIX}} cmake --build . --parallel -v" command: "{{.Env.TESTS_ENV_PREFIX}} cmake --build . --parallel -v"

4
coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
View File

@ -19,7 +19,7 @@ instructions:
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: COIN_CMAKE_ARGS variableName: COIN_CMAKE_ARGS
# The lack of space between the non qtbase configure args and the rest of the args is important! # The lack of space between the non qtbase configure args and the rest of the args is important!
variableValue: "{{.Env.NON_QTBASE_CONFIGURE_ARGS}} -DBUILD_TESTING=OFF {{.SourceDir}}" variableValue: "{{.Env.NON_QTBASE_CONFIGURE_ARGS}} -DBUILD_TESTING=OFF -DCMAKE_AUTOGEN_VERBOSE=ON {{.SourceDir}}"
- !include "{{qt/qtbase}}/call_host_cmake.yaml" - !include "{{qt/qtbase}}/call_host_cmake.yaml"
- type: ExecuteCommand - type: ExecuteCommand
command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v" command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v"
@ -49,7 +49,7 @@ instructions:
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: COIN_CMAKE_ARGS variableName: COIN_CMAKE_ARGS
# The lack of space between the non qtbase configure args and the rest of the args is important! # The lack of space between the non qtbase configure args and the rest of the args is important!
variableValue: "{{.Env.NON_QTBASE_TARGET_CONFIGURE_ARGS}} -DBUILD_TESTING=OFF {{.SourceDir}}" variableValue: "{{.Env.NON_QTBASE_TARGET_CONFIGURE_ARGS}} -DBUILD_TESTING=OFF -DCMAKE_AUTOGEN_VERBOSE=ON {{.SourceDir}}"
- !include "{{qt/qtbase}}/call_target_cmake.yaml" - !include "{{qt/qtbase}}/call_target_cmake.yaml"
- type: ExecuteCommand - type: ExecuteCommand
command: "{{.Env.TARGET_ENV_PREFIX}} cmake --build . --parallel -v" command: "{{.Env.TARGET_ENV_PREFIX}} cmake --build . --parallel -v"

4
coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
View File

@ -17,7 +17,7 @@ instructions:
- type: ChangeDirectory - type: ChangeDirectory
directory: "{{.BuildDir}}" directory: "{{.BuildDir}}"
- type: ExecuteCommand - type: ExecuteCommand
command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}}/host -DBUILD_TESTING=OFF {{.SourceDir}}" command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}}/host -DBUILD_TESTING=OFF -DCMAKE_AUTOGEN_VERBOSE=ON {{.SourceDir}}"
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
maxTimeInSeconds: 6000 maxTimeInSeconds: 6000
maxTimeBetweenOutput: 1200 maxTimeBetweenOutput: 1200
@ -63,7 +63,7 @@ instructions:
property: platformDependency property: platformDependency
equals_value: null equals_value: null
- type: ExecuteCommand - type: ExecuteCommand
command: "{{.Env.TARGET_ENV_PREFIX}} cmake {{.Env.TARGET_CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}}/target -DBUILD_TESTING=OFF {{.SourceDir}}" command: "{{.Env.TARGET_ENV_PREFIX}} cmake {{.Env.TARGET_CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}}/target -DBUILD_TESTING=OFF -DCMAKE_AUTOGEN_VERBOSE=ON {{.SourceDir}}"
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
maxTimeInSeconds: 6000 maxTimeInSeconds: 6000
maxTimeBetweenOutput: 1200 maxTimeBetweenOutput: 1200

2
coin/instructions/cmake_module_build_instructions.yaml
View File

@ -9,7 +9,7 @@ instructions:
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: COIN_CMAKE_ARGS variableName: COIN_CMAKE_ARGS
# The lack of space between the non qtbase configure args and the rest of the args is important! # The lack of space between the non qtbase configure args and the rest of the args is important!
variableValue: "{{.Env.NON_QTBASE_CONFIGURE_ARGS}} -DBUILD_TESTING=OFF {{.SourceDir}}" variableValue: "{{.Env.NON_QTBASE_CONFIGURE_ARGS}} -DBUILD_TESTING=OFF -DCMAKE_AUTOGEN_VERBOSE=ON {{.SourceDir}}"
- !include "{{qt/qtbase}}/call_cmake.yaml" - !include "{{qt/qtbase}}/call_cmake.yaml"
- type: ExecuteCommand - type: ExecuteCommand
command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v" command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v"