From 27dd0c29fec07284bbae3a7ad54896c200f5b7b5 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Thu, 24 Nov 2022 07:55:04 +0200 Subject: Qt6: Build wasm target binaries only once non-threaded Wasm build will be built only in windows. threaded wasm build will be done in macOS. thread-asyncify wasm build will be done in linux. Change-Id: Ibea96aca1ec4ce15c632ba2f4223d898f6ebffaa Reviewed-by: Heikki Halmet --- coin/platform_configs/cmake_platforms_wasm.yaml | 56 +------------------------ 1 file changed, 2 insertions(+), 54 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 5a85d471..6ab2850c 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -1,30 +1,5 @@ Version: 2 Configurations: -- - Id: 'webassembly-linux' - Template: 'qtci-linux-openSUSE-15.4-x86_64-50' - Target os: 'WebAssembly' - Compiler: 'GCC' - Platform dependency: 'OpenSUSE-15.4-host' - Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] - Environment variables: [ - 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', - 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples', - 'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer', - 'CONAN_PROFILE=coin/conan/profiles/ci-linux-webassembly-x86_64-clang' - ] -- - Id: 'webassembly-linux-thread' - Template: 'qtci-linux-openSUSE-15.4-x86_64-50' - Target os: 'WebAssembly' - Compiler: 'GCC' - Platform dependency: 'OpenSUSE-15.4-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.4-x86_64-50' @@ -48,39 +23,11 @@ Configurations: 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples', + 'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}}', '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_22H2-x86_64-50' - Target os: 'WebAssembly' - Compiler: 'Mingw' - Target compiler: 'Clang' - Platform dependency: 'Windows10_22H2-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 -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}}', - ] -- - 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', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local', - ] - Id: 'webassembly-macos-thread' Template: 'qtci-macos-12-x86_64-105' @@ -93,4 +40,5 @@ Configurations: 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local', + 'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON' ] -- cgit v1.2.3