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

Revert "CMake: Propagate configure args to all repositories"

Browse Source 
This reverts commit adbadc57df9f70ee4144f0dd2425192593656394.

The change breaks building of repos other than qtbase when
cross-compiling to Android. Not sure yet why.

Change-Id: I6a6efef5360ed141c0c5056afb03b1a0d90439ae
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexandru Croitor 2020-07-08 21:12:25 +02:00
parent f941555420
commit 946fc92d20
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
View File

@ -16,7 +16,7 @@ instructions:
directory: "{{.BuildDir}}" directory: "{{.BuildDir}}"
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: COIN_CMAKE_ARGS variableName: COIN_CMAKE_ARGS
variableValue: "{{.Env.CONFIGURE_ARGS}} -DBUILD_TESTING=OFF {{.SourceDir}}" variableValue: "-DBUILD_TESTING=OFF {{.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"
@ -41,7 +41,7 @@ instructions:
directory: "{{.BuildDir}}" directory: "{{.BuildDir}}"
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: COIN_CMAKE_ARGS variableName: COIN_CMAKE_ARGS
variableValue: "{{.Env.TARGET_CONFIGURE_ARGS}} -DBUILD_TESTING=OFF {{.SourceDir}}" variableValue: "-DBUILD_TESTING=OFF {{.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"

2
coin/instructions/cmake_module_build_instructions.yaml
View File

@ -8,7 +8,7 @@ instructions:
directory: "{{.BuildDir}}" directory: "{{.BuildDir}}"
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: COIN_CMAKE_ARGS variableName: COIN_CMAKE_ARGS
variableValue: "{{.Env.CONFIGURE_ARGS}} -DBUILD_TESTING=OFF {{.SourceDir}}" variableValue: "-DBUILD_TESTING=OFF {{.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"