lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

coin: Use configure for WASM configurations

Browse Source 
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I534b630946f1fd9f79e8466886ea727697cabbc4
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 615091a6a8)
This commit is contained in:
Alexandru Croitor
2022-04-19 15:32:15 +02:00
parent 8255351cfb
commit 47a7d9b16d
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
coin/platform_configs/cmake_platforms_wasm.yaml
View File

@@ -5,10 +5,10 @@ Configurations:
Target os: 'WebAssembly'
Compiler: 'GCC'
Platform dependency: 'OpenSUSE-15.3-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples'
]
-
Template: 'qtci-windows-10_21H2-x86_64-51'
@@ -16,22 +16,23 @@ Configurations:
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_pkg_config=OFF']
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF'
]
-
Template: 'qtci-macos-10.14-x86_64'
Target os: 'WebAssembly'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
Features: ['Packaging', 'Sccache', 'DisableTests']
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/linux-webassembly-x86_64-gcc'
]