From ed0e8823966041140ed1a6b4c320d8e2ed241d01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Wed, 12 Oct 2022 11:23:49 +0200 Subject: Make sure all wasm configurations have an Id The format is "webassembly-host-config". Change-Id: Ibb360d8ea41cb50f7a1c6411432ac9df0200398a Reviewed-by: David Skoland --- coin/platform_configs/cmake_platforms_wasm.yaml | 32 ++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 4f7dea69..ca410fb7 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -1,6 +1,7 @@ Version: 2 Configurations: - + Id: 'webassembly-linux' Template: 'qtci-linux-openSUSE-15.3-x86_64-50' Target os: 'WebAssembly' Compiler: 'GCC' @@ -14,7 +15,7 @@ Configurations: 'CONAN_PROFILE=coin/conan/profiles/ci-linux-webassembly-x86_64-clang' ] - - Id: 'webassembly-thread-asyncify' + Id: 'webassembly-linux-thread-asyncify' Template: 'qtci-linux-openSUSE-15.3-x86_64-50' Target os: 'WebAssembly' Compiler: 'GCC' @@ -24,3 +25,32 @@ Configurations: 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_thread=ON -DQT_QMAKE_DEVICE_OPTIONS="QT_EMSCRIPTEN_ASYNCIFY=1"', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Id: 'webassembly-windows' + 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', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF', + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw', + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-webassembly-x86_64-clang'] +- + Id: 'webassembly-macos' + 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', + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang', + 'CONAN_PROFILE=coin/conan/profiles/ci-macos-webassembly-x86_64-clang' + ] -- cgit v1.2.3