From 7952e46b8b80f8770c4f2e00cbb063a4106c0918 Mon Sep 17 00:00:00 2001 From: "l.feng" <43399351+msclock@users.noreply.github.com> Date: Wed, 25 Dec 2024 11:43:33 +0800 Subject: [PATCH] fix: load detected triplet (#23) Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com> --- .../cmake/vcpkg/bootstrap/vcpkg_load_triplet.cmake | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/template/cmake/vcpkg/bootstrap/vcpkg_load_triplet.cmake b/template/cmake/vcpkg/bootstrap/vcpkg_load_triplet.cmake index 6ceb2f0..95722b1 100644 --- a/template/cmake/vcpkg/bootstrap/vcpkg_load_triplet.cmake +++ b/template/cmake/vcpkg/bootstrap/vcpkg_load_triplet.cmake @@ -207,19 +207,22 @@ macro(_vcpkg_load_triplet) set(_community_triplet "triplets/community/${VCPKG_TARGET_TRIPLET}.cmake") if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/${_triplet}") - include("${CMAKE_CURRENT_LIST_DIR}/${_triplet}") + set(_load_triplet "${CMAKE_CURRENT_LIST_DIR}/${_triplet}") elseif(EXISTS "${_VCPKG_ROOT}/${_triplet}") - include("${_VCPKG_ROOT}/${_triplet}") - elseif(EXISTS "${CMAKE_CURRENT_LIST_DIR}/${_community_triplet}") - include("${CMAKE_CURRENT_LIST_DIR}/${_community_triplet}") + set(_load_triplet "${_VCPKG_ROOT}/${_triplet}") elseif(EXISTS "${_VCPKG_ROOT}/${_community_triplet}") - include("${_VCPKG_ROOT}/${_community_triplet}") + set(_load_triplet "${_VCPKG_ROOT}/${_community_triplet}") else() message( FATAL_ERROR "Triplet ${VCPKG_TARGET_TRIPLET} not found at ${CMAKE_CURRENT_LIST_DIR}/${_triplet} or ${_VCPKG_ROOT}/${_triplet}" ) endif() + + message(STATUS "Loading triplet: ${_load_triplet}") + include(${_load_triplet}) + unset(_triplet) unset(_community_triplet) + unset(_load_triplet) endmacro(_vcpkg_load_triplet)