Skip to content

Commit

Permalink
Fix TAEF lookup for nuget and SDK paths (microsoft#5452)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
llvm-beanz authored Jul 25, 2023
1 parent c27ee11 commit 60bb2c1
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions cmake/modules/FindTAEF.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,12 @@ elseif ((CMAKE_GENERATOR_PLATFORM MATCHES "ARM.*") OR ("${CMAKE_C_COMPILER_ARCHI
endif((CMAKE_GENERATOR_PLATFORM STREQUAL "x64") OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "x64"))

set (TAEF_ARCH ${TAEF_ARCH} CACHE INTERNAL "arch for taef test")

find_program(TAEF_EXECUTABLE te.exe PATHS
$ENV{TAEF_PATH}
${CMAKE_SOURCE_DIR}/external/taef/build/Binaries/${TAEF_BIN_ARCH}
$ENV{HLSL_TAEF_DIR}/${TAEF_BIN_ARCH}
${TAEF_NUGET_BIN}/${TAEF_BIN_ARCH}
${TAEF_SDK_BIN}/${TAEF_BIN_ARCH}
${TAEF_NUGET_BIN}/${TAEF_ARCH}
${TAEF_SDK_BIN}/${TAEF_ARCH}
${WINDOWS_KIT_10_PATH}
${WINDOWS_KIT_81_PATH}
)
Expand Down

0 comments on commit 60bb2c1

Please sign in to comment.