From e8d4adaf12bb927e5b02f9051672d2b0015cb606 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Wed, 2 Jul 2025 17:14:51 +0000 Subject: [PATCH] build: always use pwsh vcpkg-list Use the `vcpkg-binpkg-prototype` `vcpkg-list` implementation and never `vcpkg list`, because the letter sometimes shortens package names and may be breaking the package installed check. Signed-off-by: Rafael Kitover --- cmake/Set-Toolchain-vcpkg.cmake | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/cmake/Set-Toolchain-vcpkg.cmake b/cmake/Set-Toolchain-vcpkg.cmake index f4dd5a82..7d1c48c8 100644 --- a/cmake/Set-Toolchain-vcpkg.cmake +++ b/cmake/Set-Toolchain-vcpkg.cmake @@ -151,20 +151,12 @@ function(vcpkg_is_installed vcpkg_exe pkg_name pkg_ver pkg_triplet powershell ou string(REPLACE "-" "." pkg_ver ${pkg_ver}) if(NOT DEFINED VCPKG_INSTALLED_COUNT) - if(VCPKG_ROOT MATCHES "Visual Studio") - execute_process( - COMMAND ${powershell} - -executionpolicy bypass -noprofile - -command "import-module '${CMAKE_BINARY_DIR}/vcpkg-binpkg/vcpkg-binpkg.psm1'; vcpkg-list" - OUTPUT_VARIABLE vcpkg_list_text - ) - else() - execute_process( - COMMAND ${vcpkg_exe} list - OUTPUT_VARIABLE vcpkg_list_text - ERROR_QUIET - ) - endif() + execute_process( + COMMAND ${powershell} + -executionpolicy bypass -noprofile + -command "import-module '${CMAKE_BINARY_DIR}/vcpkg-binpkg/vcpkg-binpkg.psm1'; vcpkg-list" + OUTPUT_VARIABLE vcpkg_list_text + ) string(REGEX REPLACE "\r?\n" ";" vcpkg_list_raw "${vcpkg_list_text}")