From 24d74879844ac1b5b56a312b602147d63820e07a Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Tue, 11 Jul 2023 14:09:26 +0200 Subject: [PATCH] Set VCPKG_CHAINLOAD_TOOLCHAIN_FILE to supplied_toolchain_file Just a minor change, so that it's clear that we are setting the supplied toolchain as the VCPKG_CHAINLOAD_TOOLCHAIN_FILE. Change-Id: I10b35f04e7ad684015062066f67117ce4a964c1c Reviewed-by: Alexandru Croitor (cherry picked from commit ab89b9cab3d5644a81735f594b5a83ac9e441d47) Reviewed-by: Amir Masoud Abdol --- cmake/QtAutoDetect.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtAutoDetect.cmake b/cmake/QtAutoDetect.cmake index 5652124d915..cbfd5826db4 100644 --- a/cmake/QtAutoDetect.cmake +++ b/cmake/QtAutoDetect.cmake @@ -171,7 +171,7 @@ function(qt_auto_detect_vcpkg) if(DEFINED CMAKE_TOOLCHAIN_FILE) get_filename_component(supplied_toolchain_file "${CMAKE_TOOLCHAIN_FILE}" ABSOLUTE) if(NOT supplied_toolchain_file STREQUAL vcpkg_toolchain_file) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_TOOLCHAIN_FILE}" CACHE STRING "") + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${supplied_toolchain_file}" CACHE STRING "") endif() unset(supplied_toolchain_file) endif()