AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Propagate configure args to all repositories

Browse Source 
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>
This commit is contained in:
Alexandru Croitor 2020-07-07 15:00:19 +02:00
parent 3439113984
commit adbadc57df
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}}"
- 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"

2
coin/instructions/cmake_module_build_instructions.yaml
View File

@ -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"