diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2022-02-03 11:16:52 +0200 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2022-02-04 08:17:15 +0200 |
| commit | 0e641142c1d5f6c98a8140ed65862cb377ce6d91 (patch) | |
| tree | 17b7c7a38d2af3584fde8138a8ec7337fa74362f /coin/platform_configs/cmake_platforms.yaml | |
| parent | 72997d7039f5ce77fc5eca06152d38f70510bde4 (diff) | |
Make Win 10 21H2 Environment variables to match with the old Win 10
Fix few differencies. E.g. Conan env variables are missing
Pick-to: 6.3
Change-Id: Id08c422b1df61c2acaf59cf2bcdb0cc55cdcb1e7
Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to 'coin/platform_configs/cmake_platforms.yaml')
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 893cb36a..b745c5ed 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -67,7 +67,8 @@ Configurations: Features: ['Packaging', 'Sccache', "DebugAndRelease"] Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' Environment variables: [ - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'] + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', + 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64'] - Template: 'qtci-windows-11_21H2-x86_64-51' Compiler: 'MSVC2019' @@ -127,8 +128,12 @@ Configurations: Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging'] 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', - ] + '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}}', + 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-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: 'Windows11_21H2-MSVC2019-x64-host' Template: 'qtci-windows-11_21H2-x86_64-51' @@ -188,7 +193,8 @@ Configurations: Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'] + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', + 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-mingw'] - Id: 'Windows10-LLVM-x64-host' Template: 'qtci-windows-10-x86_64-52' |