Skip to content

Commit 5337ede

Browse files
committed
fix: Windows build
1 parent 6357bdc commit 5337ede

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

llama/cmake/win32.ensureNinjaPath.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ function(ensureNinjaPath)
77

88
if(NINJA_EXECUTABLE AND EXISTS "${NINJA_EXECUTABLE}")
99
set(CMAKE_MAKE_PROGRAM "${NINJA_EXECUTABLE}")
10+
set(CMAKE_MAKE_PROGRAM "${NINJA_EXECUTABLE}" CACHE FILEPATH "Make program")
1011
set(CMAKE_MAKE_PROGRAM "${NINJA_EXECUTABLE}" PARENT_SCOPE)
1112
endif()
1213

@@ -20,6 +21,7 @@ function(ensureNinjaPath)
2021
if(FOUND_NINJA_EXE)
2122
list(GET FOUND_NINJA_EXE 0 FOUND_CMAKE_MAKE_PROGRAM)
2223
set(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}")
24+
set(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}" CACHE FILEPATH "Make program")
2325
set(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}" PARENT_SCOPE)
2426
endif()
2527
endif()
@@ -35,6 +37,7 @@ function(ensureNinjaPath)
3537
if(FOUND_NINJA_EXE)
3638
list(GET FOUND_NINJA_EXE 0 FOUND_CMAKE_MAKE_PROGRAM)
3739
set(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}")
40+
set(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}" CACHE FILEPATH "Make program")
3841
set(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}" PARENT_SCOPE)
3942
endif()
4043
endif()
@@ -51,6 +54,7 @@ function(ensureNinjaPath)
5154
if(FOUND_NINJA_EXE)
5255
list(GET FOUND_NINJA_EXE 0 FOUND_CMAKE_MAKE_PROGRAM)
5356
set(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}")
57+
set(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}" CACHE FILEPATH "Make program")
5458
set(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}" PARENT_SCOPE)
5559
break()
5660
endif()

0 commit comments

Comments
 (0)