diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2021-05-20 10:30:22 +0300 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2021-11-09 09:01:19 +0200 |
| commit | 30a1ea30a68c5c307562d4c08a14ee36024ddf49 (patch) | |
| tree | 5d6a168de6303db4636762a3c96ceaa89d690151 /coin/platform_configs | |
| parent | 8ef536b79ec35933ba2d8c03eadf926f75d5f9ee (diff) | |
Provisioning: Install OpenSSL 1.1.1k ARM64 for Windows
Task-number: QTBUG-93822
Pick-to: 6.2
Change-Id: If48dcc4e9542070a6d0303406b2b0544d35879d4
Reviewed-by: Simo Fält <simo.falt@qt.io>
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 51a970b4..2e1bcf0d 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -115,11 +115,14 @@ Configurations: Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging'] Platform dependency: 'Windows10-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', + '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 -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}', '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', 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64', - 'CONAN_PROFILE=coin/conan/profiles/windows-arm64-msvc2019_64'] + 'CONAN_PROFILE=coin/conan/profiles/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}}'] - Id: 'Windows10_21H1-MSVC2019-x64-host' Template: 'qtci-windows-10_21H1-x86_64-52' |