From 34889bf8102e806289613e566e835420d7ea3d70 Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Sun, 12 Jan 2025 15:11:52 +0200 Subject: [PATCH] cmake : cont ggml-ci --- cmake/common.cmake | 2 +- examples/run/CMakeLists.txt | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake/common.cmake b/cmake/common.cmake index bbc9c412e..5dee785c3 100644 --- a/cmake/common.cmake +++ b/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() diff --git a/examples/run/CMakeLists.txt b/examples/run/CMakeLists.txt index 22b43524b..5e9c57bbc 100644 --- a/examples/run/CMakeLists.txt +++ b/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()