1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set VCPKG_CHAINLOAD_TOOLCHAIN_FILE to supplied_toolchain_file

Browse Source 
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 <alexandru.croitor@qt.io>
(cherry picked from commit ab89b9cab3d5644a81735f594b5a83ac9e441d47)
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
This commit is contained in:
Amir Masoud Abdol 2023-07-11 14:09:26 +02:00 committed by Alexandru Croitor
parent 1b86f3c348
commit 24d7487984
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtAutoDetect.cmake
View File

@ -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()