File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ if (NOT MSVC)
2424 endif ()
2525endif ()
2626
27- function (get_flags CCID CCVER)
27+ function (ggml_get_flags CCID CCVER)
2828 set (C_FLAGS "" )
2929 set (CXX_FLAGS "" )
3030
@@ -41,6 +41,7 @@ function(get_flags CCID CCVER)
4141 elseif (CCID STREQUAL "GNU" )
4242 set (C_FLAGS -Wdouble-promotion)
4343 set (CXX_FLAGS -Wno-array-bounds)
44+
4445 if (CCVER VERSION_GREATER_EQUAL 8.1.0)
4546 list (APPEND CXX_FLAGS -Wextra-semi)
4647 endif ()
@@ -69,7 +70,7 @@ if (GGML_ALL_WARNINGS)
6970 list (APPEND C_FLAGS ${WARNING_FLAGS} )
7071 list (APPEND CXX_FLAGS ${WARNING_FLAGS} )
7172
72- get_flags (${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} )
73+ ggml_get_flags (${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} )
7374
7475 add_compile_options ("$<$<COMPILE_LANGUAGE:C>:${C_FLAGS} ;${GF_C_FLAGS} >"
7576 "$<$<COMPILE_LANGUAGE:CXX>:${CXX_FLAGS} ;${GF_CXX_FLAGS} >" )
Original file line number Diff line number Diff line change @@ -132,7 +132,7 @@ if (CUDAToolkit_FOUND)
132132
133133 message ("-- CUDA host compiler is ${CUDA_CCID} ${CUDA_CCVER} " )
134134
135- get_flags (${CUDA_CCID} ${CUDA_CCVER} )
135+ ggml_get_flags (${CUDA_CCID} ${CUDA_CCVER} )
136136 list (APPEND CUDA_CXX_FLAGS ${CXX_FLAGS} ${GF_CXX_FLAGS} ) # This is passed to -Xcompiler later
137137 endif ()
138138
You can’t perform that action at this time.
0 commit comments