From ee3c82a2342b560d9f8bc953332e00c35c7a3b17 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 6 Feb 2025 15:00:45 +0100 Subject: [PATCH] [vcpkg] Fix the chainloading of the platform specific toolchain files QT_CHAINLOAD_TOOLCHAIN_FILE might not be set, but __qt_chainload_toolchain_file falls back to the value initially set when building qtbase in per-module build scenario. Use the correct variable(__qt_chainload_toolchain_file) when specifying VCPKG_CHAINLOAD_TOOLCHAIN_FILE. Pick-to: 6.8 Change-Id: I331c305a17172a1cc67a6ed8b43b2baa380abc0b Reviewed-by: Alexandru Croitor (cherry picked from commit c65d6319f9379a724ddb4c0757245fe51c93fac5) Reviewed-by: Qt Cherry-pick Bot --- cmake/qt.toolchain.cmake.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/qt.toolchain.cmake.in b/cmake/qt.toolchain.cmake.in index e21781fb39f..a00070be2f1 100644 --- a/cmake/qt.toolchain.cmake.in +++ b/cmake/qt.toolchain.cmake.in @@ -52,8 +52,8 @@ if(QT_USE_VCPKG OR (NOT DEFINED QT_USE_VCPKG AND __qt_initially_configured_use_v ) endif() - if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE AND QT_CHAINLOAD_TOOLCHAIN_FILE) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${QT_CHAINLOAD_TOOLCHAIN_FILE}" CACHE STRING "") + if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE AND __qt_chainload_toolchain_file) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${__qt_chainload_toolchain_file}" CACHE STRING "") endif() set(__qt_chainload_toolchain_file "${__qt_vcpkg_toolchain_file}")