diff --git a/coin/platform_configs/address_sanitizer_platforms.yaml b/coin/platform_configs/address_sanitizer_platforms.yaml index 587e6ce3..8bb7b042 100644 --- a/coin/platform_configs/address_sanitizer_platforms.yaml +++ b/coin/platform_configs/address_sanitizer_platforms.yaml @@ -8,5 +8,7 @@ Configurations: Configure arguments: '-nomake examples -developer-build' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=x64-linux-qt', ] diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index fb385b8e..e110b6d7 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -16,7 +16,9 @@ Configurations: Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=x64-linux-qt', ] # Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later - @@ -27,7 +29,9 @@ Configurations: Configure arguments: '-make examples -developer-build -c++std c++20 -linker lld -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb' Environment variables: [ 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE', + 'VCPKG_HOST_TRIPLET=arm64-linux-qt', + 'VCPKG_TARGET_TRIPLET=arm64-linux-qt', ] - Id: 'ubuntu-24.04-arm64' @@ -38,7 +42,9 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON', + 'VCPKG_HOST_TRIPLET=arm64-linux-qt', + 'VCPKG_TARGET_TRIPLET=arm64-linux-qt', ] # Test on Ubuntu 24.04 ARM64 offscreen - @@ -61,7 +67,9 @@ Configurations: Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace' Environment variables: [ 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=x64-linux-qt', ] - Id: 'ubuntu-24.04-x64' @@ -72,7 +80,9 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=x64-linux-qt', ] # Test on Ubuntu 24.04 x64 X11 - @@ -96,7 +106,9 @@ Configurations: Environment variables: [ 'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}', 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=x64-linux-qt', ] - Id: 'sles-15_sp5-static' @@ -106,7 +118,9 @@ Configurations: Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=x64-linux-qt', ] - Id: 'sles-15_sp6-static' @@ -116,7 +130,9 @@ Configurations: Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=x64-linux-qt', ] - Id: 'windows-10_22h2-msvc2022' @@ -128,6 +144,8 @@ Configurations: 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_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 -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_x64}}', ] @@ -141,6 +159,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}}', ] - @@ -164,6 +184,8 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', 'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', + 'VCPKG_HOST_TRIPLET=arm64-windows-qt', + 'VCPKG_TARGET_TRIPLET=arm64-windows-qt', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] - @@ -197,6 +219,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}}', ] - @@ -216,6 +240,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}}', ] - @@ -238,7 +264,9 @@ Configurations: Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=x64-linux-qt', ] - Id: 'rhel-9.4' @@ -248,7 +276,9 @@ Configurations: Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=x64-linux-qt', ] - Id: 'ios-universal' diff --git a/coin/platform_configs/cmake_platforms_qemu.yaml b/coin/platform_configs/cmake_platforms_qemu.yaml index 8e64879a..fa12dd94 100644 --- a/coin/platform_configs/cmake_platforms_qemu.yaml +++ b/coin/platform_configs/cmake_platforms_qemu.yaml @@ -16,6 +16,8 @@ Configurations: 'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}', 'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=armv7-linux-qt', ] - Id: 'qemu-arm64-developer-build' @@ -33,6 +35,8 @@ Configurations: 'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}', 'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=arm64-linux-qt', ] - Id: 'qemu-mips64-developer-build' @@ -50,4 +54,6 @@ Configurations: 'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}', 'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=mips64-linux-qt', ] diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml index 1dc43a8a..2da7cc03 100644 --- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml @@ -16,6 +16,8 @@ Configurations: 'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci', 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'QNX_QEMU={{.Env.QNX_710_QEMU}}', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=x64-qnx-qt', ] - Id: 'qnx-710-arm64-on-linux' @@ -30,6 +32,8 @@ Configurations: 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=arm64-qnx-qt', ] - Id: 'qnx-710-armv7-on-linux' @@ -44,4 +48,6 @@ Configurations: 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=armv7-qnx-qt', ] diff --git a/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml b/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml index 090e6a81..8e700627 100644 --- a/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml @@ -12,7 +12,9 @@ Configurations: Environment variables: [ 'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_2_VSB', 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples', - 'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target' + 'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=armv7-vxworks-qt', ] - Id: 'vxworks-imx8-buildtest' @@ -40,5 +42,7 @@ Configurations: Environment variables: [ 'WIND_CC_SYSROOT=/opt/itl_generic_skylake_VSB', 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples', - 'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DFEATURE_harfbuzz=no -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target' + 'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DFEATURE_harfbuzz=no -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=x64-vxworks-qt', ] diff --git a/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml b/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml index 5bfe98cd..e7d1b6dd 100644 --- a/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml @@ -13,8 +13,10 @@ Configurations: 'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_2_VSB', 'VXWORKS_TEST_LIBS_PATH=/opt/fsl_imx6_2_0_6_2_VSB/usr/lib/common;/opt/fsl_imx6_2_0_6_2_VSB/usr/root/llvm/bin;/opt/fsl_imx6_2_0_6_2_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib', 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples', - 'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target' - ] + 'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=armv7-vxworks-qt', + ] - Id: 'vxworks-x86_64-tests' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' @@ -28,5 +30,7 @@ Configurations: 'WIND_CC_SYSROOT=/opt/itl_generic_skylake_VSB', 'VXWORKS_TEST_LIBS_PATH=/opt/itl_generic_skylake_VSB/usr/lib/common;/opt/itl_generic_skylake_VSB/usr/root/llvm/bin;/opt/itl_generic_skylake_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib', 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples', - 'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DFEATURE_harfbuzz=no -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target' + 'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DFEATURE_harfbuzz=no -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=x64-vxworks-qt', ] diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index b5199810..c58d7e95 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -11,6 +11,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}}', ] - @@ -34,6 +36,8 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF', + 'VCPKG_HOST_TRIPLET=arm64-windows-qt', + 'VCPKG_TARGET_TRIPLET=arm64-windows-qt', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] - @@ -44,7 +48,9 @@ Configurations: Configure arguments: '-static -nomake examples -release -qt-libjpeg -no-icu -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', - 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF' + 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=x64-linux-qt', ] - Id: 'ubuntu-24.04-arm64' @@ -54,7 +60,9 @@ Configurations: Configure arguments: '-static -nomake examples -release -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput -no-icu -qt-doubleconversion' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release' + 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release', + 'VCPKG_HOST_TRIPLET=arm64-linux-qt', + 'VCPKG_TARGET_TRIPLET=arm64-linux-qt', ] - diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index 52b19f8b..f740f96d 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -7,7 +7,9 @@ Configurations: Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ - 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=x64-linux-qt', ] - Id: 'sles-15_sp6-minimal-static' @@ -16,7 +18,9 @@ Configurations: Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure', 'InsignificantTests'] Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ - 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=x64-linux-qt', ] - Id: 'windows-11_23H2-minimal-static' @@ -27,6 +31,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}}', ] diff --git a/coin/platform_configs/integrity.yaml b/coin/platform_configs/integrity.yaml index d740656d..27d71994 100644 --- a/coin/platform_configs/integrity.yaml +++ b/coin/platform_configs/integrity.yaml @@ -17,4 +17,6 @@ Configurations: 'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public', 'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/', 'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH', + 'VCPKG_HOST_TRIPLET=x64-linux-qt', + 'VCPKG_TARGET_TRIPLET=arm64-integrity-qt', ] diff --git a/coin/provisioning/common/linux/install-vcpkg-ports.sh b/coin/provisioning/common/linux/install-vcpkg-ports.sh index dec6ad28..d223429c 100755 --- a/coin/provisioning/common/linux/install-vcpkg-ports.sh +++ b/coin/provisioning/common/linux/install-vcpkg-ports.sh @@ -2,6 +2,9 @@ # Copyright (C) 2023 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + echo "Installing vcpkg ports" pushd "${BASH_SOURCE%/*}/vcpkg" || exit @@ -20,6 +23,8 @@ cmake "-DVCPKG_EXECUTABLE=$VCPKG_ROOT/vcpkg"\ mkdir -p "$VCPKG_ROOT/installed" cp -R $install_root/* "$VCPKG_ROOT/installed/" +SetEnvVar "VCPKG_INSTALLED_DIR" "$VCPKG_ROOT/installed/" + rm -rf $install_root popd || exit diff --git a/coin/provisioning/common/windows/install-vcpkg-ports.ps1 b/coin/provisioning/common/windows/install-vcpkg-ports.ps1 index 34198ee6..07761095 100644 --- a/coin/provisioning/common/windows/install-vcpkg-ports.ps1 +++ b/coin/provisioning/common/windows/install-vcpkg-ports.ps1 @@ -20,6 +20,8 @@ Copy-Item -Path "$vcpkginstallroot\*" -Destination "$vcpkgRoot\installed" -Recur Run-Executable "cmake" "-DVCPKG_EXECUTABLE=$vcpkgExe -DVCPKG_INSTALL_ROOT=$vcpkgInstallRoot -DOUTPUT=$env:USERPROFILE\versions.txt -P $PSScriptRoot\..\shared\vcpkg_parse_packages.cmake" +Set-EnvironmentVariable "VCPKG_INSTALLED_DIR" "$vcpkgRoot\installed" + Remove-Item -Path "$vcpkginstallroot" -Recurse -Force Set-Location "$PSScriptRoot"