From b8d17f44812b45be1400114e281992abb754797b Mon Sep 17 00:00:00 2001 From: Ryan Schmidt Date: Sat, 19 Nov 2022 21:32:44 -0600 Subject: [PATCH] Don't overwrite user-specified CFLAGS and CXXFLAGS (#51) * Check C and C++ compiler separately It's possible (however unlikely) that the C++ compiler might be clang but the C compiler might not be. * Don't overwrite user-specified CFLAGS and CXXFLAGS --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ef6935..8bb3f3f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,9 +10,13 @@ set(CMAKE_C_STANDARD_REQUIRED TRUE) set(CMAKE_C_EXTENSIONS FALSE) if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") + # Clang or AppleClang + set(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}") +endif() + +if ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang") # Clang or AppleClang - set(CMAKE_CXX_FLAGS "-Wall") - set(CMAKE_C_FLAGS "-Wall") + set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}") endif()