From dad9a23e896c80bd1d239db225a75509ba00b1d3 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Fri, 27 Jun 2025 23:37:28 +0300 Subject: [PATCH] Extend VCPKG_INSTALLED_DIR, VCPKG_HOST_TRIPLET, VCPGK_TARGET_TRIPLET Set the VCPKG_INSTALLED_DIR, VCPKG_HOST_TRIPLET, VCPGK_TARGET_TRIPLET environment variables after vcpkg ports installation. These variables will be used when building Qt modules to setup the correct build environment. (This commit extends original f41e72adc6905879ef82c20feae91d3ff6edf7bc) Change-Id: I7956fc828d6c490f19bfa5222d7db29d1550687e Reviewed-by: Joerg Bornemann --- coin/platform_configs/cmake_platforms.yaml | 6 ++++++ coin/platform_configs/cmake_platforms_static_release.yaml | 2 ++ coin/platform_configs/cmake_platforms_static_tests.yaml | 2 ++ 3 files changed, 10 insertions(+) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 0804f888..60dcb657 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -195,6 +195,8 @@ Configurations: 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', + 'VCPKG_HOST_TRIPLET=x64-windows-qt', + 'VCPKG_TARGET_TRIPLET=x64-windows-qt', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', ] @@ -227,6 +229,8 @@ Configurations: 'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}', 'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}', 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}', + 'VCPKG_HOST_TRIPLET=x64-windows-qt', + 'VCPKG_TARGET_TRIPLET=arm64-windows-qt', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', ] @@ -281,6 +285,8 @@ Configurations: 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', + 'VCPKG_HOST_TRIPLET=x64-windows-qt', + 'VCPKG_TARGET_TRIPLET=x64-windows-qt', 'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}', ] - diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index c5abd701..ab2227e9 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -25,6 +25,8 @@ Configurations: 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', + 'VCPKG_HOST_TRIPLET=x64-windows-qt', + 'VCPKG_TARGET_TRIPLET=x64-windows-qt', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] - diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index 61e60135..8c88de2d 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -34,6 +34,8 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', + 'VCPKG_HOST_TRIPLET=x64-windows-qt', + 'VCPKG_TARGET_TRIPLET=x64-windows-qt', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}', ]