Skip to content

Commit 60bb2c1

Browse files
authored
Fix TAEF lookup for nuget and SDK paths (#5452)
The standard TAEF install paths use the x64 and x86 paths just like the TAEF_ARCH. I'm not entirely sure where the alternative TAEF_BIN_ARCH naming is used, but it seems to be used in the custom tooling for fetching and building TAEF. This only alters the parts of the code that I've been able to verify locally.
1 parent c27ee11 commit 60bb2c1

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

cmake/modules/FindTAEF.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,12 @@ elseif ((CMAKE_GENERATOR_PLATFORM MATCHES "ARM.*") OR ("${CMAKE_C_COMPILER_ARCHI
5656
endif((CMAKE_GENERATOR_PLATFORM STREQUAL "x64") OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "x64"))
5757

5858
set (TAEF_ARCH ${TAEF_ARCH} CACHE INTERNAL "arch for taef test")
59-
6059
find_program(TAEF_EXECUTABLE te.exe PATHS
6160
$ENV{TAEF_PATH}
6261
${CMAKE_SOURCE_DIR}/external/taef/build/Binaries/${TAEF_BIN_ARCH}
6362
$ENV{HLSL_TAEF_DIR}/${TAEF_BIN_ARCH}
64-
${TAEF_NUGET_BIN}/${TAEF_BIN_ARCH}
65-
${TAEF_SDK_BIN}/${TAEF_BIN_ARCH}
63+
${TAEF_NUGET_BIN}/${TAEF_ARCH}
64+
${TAEF_SDK_BIN}/${TAEF_ARCH}
6665
${WINDOWS_KIT_10_PATH}
6766
${WINDOWS_KIT_81_PATH}
6867
)

0 commit comments

Comments
 (0)