Skip to content

Commit ea0a85a

Browse files
committed
Guard against adding to cache variable twice
1 parent b14e829 commit ea0a85a

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

ggml/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,8 @@ execute_process(COMMAND ${GIT_EXE} rev-list --count HEAD
278278
OUTPUT_STRIP_TRAILING_WHITESPACE
279279
)
280280

281-
if(${GGML_BUILD_NUMBER} EQUAL 1)
282-
message(WARNING
283-
"GGML build version fixed at 1 likely due to a shallow clone.")
281+
if(GGML_BUILD_NUMBER EQUAL 1)
282+
message(WARNING "GGML build version fixed at 1 likely due to a shallow clone.")
284283
endif()
285284

286285
execute_process(COMMAND ${GIT_EXE} rev-parse --short HEAD

ggml/src/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,14 @@ function(ggml_add_backend_library backend)
252252
endif()
253253

254254
if(NOT GGML_AVAILABLE_BACKENDS)
255-
set(GGML_AVAILABLE_BACKENDS "${backend}" CACHE INTERNAL "List of backends for cmake package")
256-
else()
257-
set(GGML_AVAILABLE_BACKENDS "${GGML_AVAILABLE_BACKENDS};${backend}"
255+
set(GGML_AVAILABLE_BACKENDS "${backend}"
258256
CACHE INTERNAL "List of backends for cmake package")
257+
else()
258+
list(FIND GGML_AVAILABLE_BACKENDS "${backend}" has_backend)
259+
if(has_backend EQUAL -1)
260+
set(GGML_AVAILABLE_BACKENDS "${GGML_AVAILABLE_BACKENDS};${backend}"
261+
CACHE INTERNAL "List of backends for cmake package")
262+
endif()
259263
endif()
260264
endfunction()
261265

0 commit comments

Comments
 (0)