diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-07 15:00:19 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-08 11:01:38 +0200 |
| commit | adbadc57df9f70ee4144f0dd2425192593656394 (patch) | |
| tree | d202ac2b614381d152345c114179f253e98c1b72 /coin/instructions | |
| parent | 3439113984be460021cc15ddfac8f6d5c7f7b941 (diff) | |
| download | qtbase-adbadc57df9f70ee4144f0dd2425192593656394.tar.gz | |
CMake: Propagate configure args to all repositories
Currently the configure arguments specified in qt5.git/coin are only
used when building qtbase itself. None of them are used when
configuring other repos like qtsvg.
While in principle passing all the configure arguments to other repos
is not a good thing, we need to do it to circumvent the lack of
support for specifying per-repo configure flags in Coin.
It's needed to disable detection / usage of certain strawberry perl
system libraries in qtimageformats on MinGW. Doing that prevents
crashes of the tst_qtiff test.
Supplements 4b4f0be08debcfde62caf4066222b348ce65dea1 from qt5.git.
Task-number: QTBUG-84886
Task-number: COIN-601
Change-Id: I59be8c62ebb10282db1b0a9da2d3e3e5595c925f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'coin/instructions')
| -rw-r--r-- | coin/instructions/cmake_cross_compilation_module_build_instructions.yaml | 4 | ||||
| -rw-r--r-- | coin/instructions/cmake_module_build_instructions.yaml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml index 5d8f5e9c15..c3ff648443 100644 --- a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml +++ b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml @@ -16,7 +16,7 @@ instructions: directory: "{{.BuildDir}}" - type: EnvironmentVariable variableName: COIN_CMAKE_ARGS - variableValue: "-DBUILD_TESTING=OFF {{.SourceDir}}" + variableValue: "{{.Env.CONFIGURE_ARGS}} -DBUILD_TESTING=OFF {{.SourceDir}}" - !include "{{qt/qtbase}}/call_host_cmake.yaml" - type: ExecuteCommand command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v" @@ -41,7 +41,7 @@ instructions: directory: "{{.BuildDir}}" - type: EnvironmentVariable variableName: COIN_CMAKE_ARGS - variableValue: "-DBUILD_TESTING=OFF {{.SourceDir}}" + variableValue: "{{.Env.TARGET_CONFIGURE_ARGS}} -DBUILD_TESTING=OFF {{.SourceDir}}" - !include "{{qt/qtbase}}/call_target_cmake.yaml" - type: ExecuteCommand command: "{{.Env.TARGET_ENV_PREFIX}} cmake --build . --parallel -v" diff --git a/coin/instructions/cmake_module_build_instructions.yaml b/coin/instructions/cmake_module_build_instructions.yaml index b6c72bf23f..93044059f2 100644 --- a/coin/instructions/cmake_module_build_instructions.yaml +++ b/coin/instructions/cmake_module_build_instructions.yaml @@ -8,7 +8,7 @@ instructions: directory: "{{.BuildDir}}" - type: EnvironmentVariable variableName: COIN_CMAKE_ARGS - variableValue: "-DBUILD_TESTING=OFF {{.SourceDir}}" + variableValue: "{{.Env.CONFIGURE_ARGS}} -DBUILD_TESTING=OFF {{.SourceDir}}" - !include "{{qt/qtbase}}/call_cmake.yaml" - type: ExecuteCommand command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v" |