diff options
| author | Morten Sørvig <morten.sorvig@qt.io> | 2022-10-12 11:46:49 +0200 |
|---|---|---|
| committer | David Skoland <david.skoland@qt.io> | 2022-11-03 15:26:49 +0100 |
| commit | f84d1d36a98a2973334e9414bfb7cb840cd42743 (patch) | |
| tree | 7e6bb3bcefbe432b36dd27f7b2c25b98325d3953 /coin/platform_configs | |
| parent | ed0e8823966041140ed1a6b4c320d8e2ed241d01 (diff) | |
wasm: add multithreading configuration variants
Add FEATURE_thread=ON variant, with packaging enabled.
We now build the following configurations:
"webassembly" (all desktop hosts)
"webassembly-thread" (all desktop hosts)
"webassembly-thread-asyncify" (linux, for auto tests)
Change-Id: Iac212b350ed4a5551c00df4ac1cd579a1ccd05f2
Reviewed-by: David Skoland <david.skoland@qt.io>
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/cmake_platforms_wasm.yaml | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index ca410fb7..66f6cb88 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -15,6 +15,17 @@ Configurations: 'CONAN_PROFILE=coin/conan/profiles/ci-linux-webassembly-x86_64-clang' ] - + Id: 'webassembly-linux-thread' + Template: 'qtci-linux-openSUSE-15.3-x86_64-50' + Target os: 'WebAssembly' + Compiler: 'GCC' + Platform dependency: 'OpenSUSE-15.3-host' + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] + Environment variables: [ + 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', + 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread', + ] +- Id: 'webassembly-linux-thread-asyncify' Template: 'qtci-linux-openSUSE-15.3-x86_64-50' Target os: 'WebAssembly' @@ -41,6 +52,20 @@ Configurations: 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw', 'CONAN_PROFILE=coin/conan/profiles/ci-windows-webassembly-x86_64-clang'] - + Id: 'webassembly-windows-thread' + Template: 'qtci-windows-10_21H2-x86_64-51' + Target os: 'WebAssembly' + Compiler: 'Mingw' + Target compiler: 'Clang' + Platform dependency: 'Windows10_21H2-Mingw11-x64-host' + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] + Environment variables: [ + 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', + 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF', + ] +- Id: 'webassembly-macos' Template: 'qtci-macos-12-x86_64-105' Target os: 'WebAssembly' @@ -54,3 +79,15 @@ Configurations: 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang', 'CONAN_PROFILE=coin/conan/profiles/ci-macos-webassembly-x86_64-clang' ] +- + Id: 'webassembly-macos-thread' + Template: 'qtci-macos-12-x86_64-105' + Target os: 'WebAssembly' + Compiler: 'Clang' + Target compiler: 'Clang' + Platform dependency: 'macos-latest-xcode-universal-packaging-build' + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] + Environment variables: [ + 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', + 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread', + ] |