From 47a7d9b16df03932776c948c2cef361fd5d8a931 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 19 Apr 2022 15:32:15 +0200 Subject: [PATCH] coin: Use configure for WASM configurations 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 (cherry picked from commit 615091a6a80525e40438bf38e71e194f24114bfa) --- coin/platform_configs/cmake_platforms_wasm.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index a161f706..84710060 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -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' ]