Skip to content

Commit 651b5f9

Browse files
committed
[CMake] Simplify vcpkg-installed basisu tool detection
1 parent 7a33ba3 commit 651b5f9

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

3rdparty/CMakeLists.txt

+1-7
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,7 @@ if (WZ_ENABLE_BASIS_UNIVERSAL AND NOT WZ_CI_DISABLE_BASIS_COMPRESS_TEXTURES)
111111
if(DEFINED VCPKG_INSTALLED_DIR AND DEFINED VCPKG_HOST_TRIPLET)
112112
# Partial workaround for: https://github.com/microsoft/vcpkg/issues/17001
113113
# Explicitly add the HOST_TRIPLET paths to CMAKE_PROGRAM_PATH
114-
list(APPEND CMAKE_PROGRAM_PATH "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/tools")
115-
file(GLOB Z_VCPKG_TOOLS_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/tools/*")
116-
foreach(Z_VCPKG_TOOLS_DIR IN LISTS Z_VCPKG_TOOLS_DIRS)
117-
if(IS_DIRECTORY "${Z_VCPKG_TOOLS_DIR}")
118-
list(APPEND CMAKE_PROGRAM_PATH "${Z_VCPKG_TOOLS_DIR}")
119-
endif()
120-
endforeach()
114+
list(APPEND CMAKE_PROGRAM_PATH "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}")
121115
endif()
122116
find_program(BASIS_UNIVERSAL_CLI NAMES basisu PATH_SUFFIXES "tools/basisu" NO_CACHE)
123117
set(CMAKE_PROGRAM_PATH "${_ORIGINAL_CMAKE_PROGRAM_PATH}")

0 commit comments

Comments
 (0)