vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Guard against adding to cache variable twice

Browse source
This commit is contained in:
Mason M 2025-01-23 09:43:51 -04:00
parent b14e8294b1
commit ea0a85abae
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ggml/CMakeLists.txt
View file

@ -278,9 +278,8 @@ execute_process(COMMAND ${GIT_EXE} rev-list --count HEAD
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
if(${GGML_BUILD_NUMBER} EQUAL 1) if(GGML_BUILD_NUMBER EQUAL 1)
message(WARNING message(WARNING "GGML build version fixed at 1 likely due to a shallow clone.")
"GGML build version fixed at 1 likely due to a shallow clone.")
endif() endif()
execute_process(COMMAND ${GIT_EXE} rev-parse --short HEAD execute_process(COMMAND ${GIT_EXE} rev-parse --short HEAD

10
ggml/src/CMakeLists.txt
View file

@ -252,10 +252,14 @@ function(ggml_add_backend_library backend)
endif() endif()
if(NOT GGML_AVAILABLE_BACKENDS) if(NOT GGML_AVAILABLE_BACKENDS)
set(GGML_AVAILABLE_BACKENDS "${backend}" CACHE INTERNAL "List of backends for cmake package") set(GGML_AVAILABLE_BACKENDS "${backend}"
else()
set(GGML_AVAILABLE_BACKENDS "${GGML_AVAILABLE_BACKENDS};${backend}"
CACHE INTERNAL "List of backends for cmake package") CACHE INTERNAL "List of backends for cmake package")
else()
list(FIND GGML_AVAILABLE_BACKENDS "${backend}" has_backend)
if(has_backend EQUAL -1)
set(GGML_AVAILABLE_BACKENDS "${GGML_AVAILABLE_BACKENDS};${backend}"
CACHE INTERNAL "List of backends for cmake package")
endif()
endif() endif()
endfunction() endfunction()