Skip to content

Commit 33d49f7

Browse files
committed
cmake : reuse ggml_get_flags
ggml-ci
1 parent 7177eb8 commit 33d49f7

File tree

1 file changed

+1
-27
lines changed

1 file changed

+1
-27
lines changed

cmake/common.cmake

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,3 @@
1-
function(llama_get_flags CCID CCVER)
2-
set(C_FLAGS "")
3-
set(CXX_FLAGS "")
4-
5-
if (CCID MATCHES "Clang")
6-
set(C_FLAGS -Wunreachable-code-break -Wunreachable-code-return)
7-
set(CXX_FLAGS -Wunreachable-code-break -Wunreachable-code-return -Wmissing-prototypes -Wextra-semi)
8-
9-
if (
10-
(CCID STREQUAL "Clang" AND CCVER VERSION_GREATER_EQUAL 3.8.0) OR
11-
(CCID STREQUAL "AppleClang" AND CCVER VERSION_GREATER_EQUAL 7.3.0)
12-
)
13-
list(APPEND C_FLAGS -Wdouble-promotion)
14-
endif()
15-
elseif (CCID STREQUAL "GNU")
16-
set(C_FLAGS -Wdouble-promotion)
17-
set(CXX_FLAGS -Wno-array-bounds)
18-
if (CCVER VERSION_GREATER_EQUAL 8.1.0)
19-
list(APPEND CXX_FLAGS -Wextra-semi)
20-
endif()
21-
endif()
22-
23-
set(GF_C_FLAGS ${C_FLAGS} PARENT_SCOPE)
24-
set(GF_CXX_FLAGS ${CXX_FLAGS} PARENT_SCOPE)
25-
endfunction()
26-
271
function(llama_add_compile_flags)
282
if (LLAMA_FATAL_WARNINGS)
293
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -46,7 +20,7 @@ function(llama_add_compile_flags)
4620
list(APPEND C_FLAGS ${WARNING_FLAGS})
4721
list(APPEND CXX_FLAGS ${WARNING_FLAGS})
4822

49-
llama_get_flags(${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION})
23+
ggml_get_flags(${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION})
5024

5125
add_compile_options("$<$<COMPILE_LANGUAGE:C>:${C_FLAGS};${GF_C_FLAGS}>"
5226
"$<$<COMPILE_LANGUAGE:CXX>:${CXX_FLAGS};${GF_CXX_FLAGS}>")

0 commit comments

Comments
 (0)