cmake : cont

ggml-ci

Author: ggerganov

cmake/common.cmake

@@ -16,7 +16,7 @@ function(llama_add_compile_flags)
             list(APPEND CXX_FLAGS -Wmissing-declarations -Wmissing-noreturn)
 
             # GCC -Wshadow is way too agressive
-            if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+            if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
                 list(APPEND CXX_FLAGS -Wshadow)
             endif()
 

examples/run/CMakeLists.txt

@@ -3,4 +3,7 @@ add_executable(${TARGET} run.cpp)
 install(TARGETS ${TARGET} RUNTIME)
 target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
 target_compile_features(${TARGET} PRIVATE cxx_std_17)
-target_compile_options(${TARGET} PRIVATE -Wno-shadow) # TMP
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    target_compile_options(${TARGET} PRIVATE -Wno-shadow) # TMP
+endif()