lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-17 17:56:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

coin: Use configure for Windows MSVC arm64 configurations

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

As a drive-by, remove compiler launcher assignments. They are
handled automatically by the qtbase instructions.

Pick-to: 6.2 6.3 6.4
Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: Id7b02804aa2c931e81f227cae64b19ab0e40f82d
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Alexandru Croitor
2022-04-19 14:26:55 +02:00
parent aa0c9d4943
commit ce76bcd8e2
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
coin/platform_configs/cmake_platforms.yaml
View File

@@ -90,15 +90,17 @@ Configurations:
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2019'
Target arch: 'arm64'
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging']
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
Platform dependency: 'Windows10_21H2-MSVC2019-x64-host'
Environment variables: [
'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64',
'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}']
'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}'
]
-
Id: 'Windows11_21H2-MSVC2019-x64-host'
Template: 'qtci-windows-11_21H2-x86_64-51'
@@ -112,14 +114,14 @@ Configurations:
Template: 'qtci-windows-11_21H2-x86_64-51'
Compiler: 'MSVC2019'
Target arch: 'arm64'
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging']
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
Platform dependency: 'Windows11_21H2-MSVC2019-x64-host'
Environment variables: [
'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64']
'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64'
]
-
Id: 'RHEL-8.4-host'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'