Skip to content

Commit c4c066b

Browse files
committed
fix: adapt to breaking llama.cpp changes
1 parent 7643291 commit c4c066b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

llama/cmake/win32.programFilesPaths.cmake

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
function(setProgramFilesPaths CURRENT_ARCH)
2+
set(PROGRAMFILES_X86_ENV_NAME "ProgramFiles(x86)")
3+
24
set(PROGRAMFILES "$ENV{ProgramFiles}")
3-
set(PROGRAMFILES_X86 "$ENV{ProgramFiles\(x86\)}")
5+
set(PROGRAMFILES_X86 "$ENV{${PROGRAMFILES_X86_ENV_NAME}}")
46
file(TO_CMAKE_PATH "${PROGRAMFILES}" PROGRAMFILES)
57
file(TO_CMAKE_PATH "${PROGRAMFILES_X86}" PROGRAMFILES_X86)
68

79
if(CURRENT_ARCH STREQUAL "arm64")
8-
set(PROGRAMFILES_ARM64 "$ENV{ProgramFiles\(Arm\)}")
10+
set(PROGRAMFILES_ARM64_ENV_NAME "ProgramFiles(Arm)")
11+
12+
set(PROGRAMFILES_ARM64 "$ENV{${PROGRAMFILES_ARM64_ENV_NAME}}")
913
file(TO_CMAKE_PATH "${PROGRAMFILES_ARM64}" PROGRAMFILES_ARM64)
1014

1115
set(PROGRAMFILES_PATHS_LIST

0 commit comments

Comments
 (0)