diff --git a/qt6base/patches/002-ignore_vcpkg_toolchain.patch b/qt6base/patches/002-ignore_vcpkg_toolchain.patch new file mode 100644 index 0000000..d46997a --- /dev/null +++ b/qt6base/patches/002-ignore_vcpkg_toolchain.patch @@ -0,0 +1,43 @@ +--- a/cmake/QtAutoDetect.cmake ++++ b/cmake/QtAutoDetect.cmake +@@ -155,32 +155,6 @@ function(qt_auto_detect_android) + endif() + endfunction() + +-function(qt_auto_detect_vcpkg) +- if(DEFINED ENV{VCPKG_ROOT}) +- set(vcpkg_toolchain_file "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake") +- get_filename_component(vcpkg_toolchain_file "${vcpkg_toolchain_file}" ABSOLUTE) +- +- 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 "") +- endif() +- unset(supplied_toolchain_file) +- endif() +- set(CMAKE_TOOLCHAIN_FILE "${vcpkg_toolchain_file}" CACHE STRING "" FORCE) +- message(STATUS "Using vcpkg from $ENV{VCPKG_ROOT}") +- if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET) +- set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "") +- message(STATUS "Using vcpkg triplet ${VCPKG_TARGET_TRIPLET}") +- endif() +- unset(vcpkg_toolchain_file) +- message(STATUS "CMAKE_TOOLCHAIN_FILE is: ${CMAKE_TOOLCHAIN_FILE}") +- if(DEFINED VCPKG_CHAINLOAD_TOOLCHAIN_FILE) +- message(STATUS "VCPKG_CHAINLOAD_TOOLCHAIN_FILE is: ${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") +- endif() +- endif() +-endfunction() +- + function(qt_auto_detect_ios) + if(CMAKE_SYSTEM_NAME STREQUAL iOS + OR CMAKE_SYSTEM_NAME STREQUAL watchOS +@@ -445,7 +419,6 @@ qt_auto_detect_darwin() + qt_auto_detect_macos_universal() + qt_auto_detect_ios() + qt_auto_detect_android() +-qt_auto_detect_vcpkg() + qt_auto_detect_pch() + qt_auto_detect_wasm() + qt_auto_detect_win32_arm()