Merge pull request cpp-best-practices#18 from valerioformato/master

Fix compiler detection for AppleClang and compiler flags for catch_ma…

Author: lefticus

cmake/CompilerWarnings.cmake

@@ -79,7 +79,7 @@ function(set_project_warnings project_name)
 
  if(MSVC)
  set(PROJECT_WARNINGS ${MSVC_WARNINGS})
- elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
  set(PROJECT_WARNINGS ${CLANG_WARNINGS})
  else()
  set(PROJECT_WARNINGS ${GCC_WARNINGS})

cmake/Sanitizers.cmake

@@ -1,7 +1,7 @@
 function(enable_sanitizers project_name)
 
- if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL
- "Clang")
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES
+ ".*Clang")
  option(ENABLE_COVERAGE "Enable coverage reporting for gcc/clang" FALSE)
 
  if(ENABLE_COVERAGE)

test/CMakeLists.txt

@@ -8,6 +8,7 @@ endif()
 
 add_library(catch_main STATIC catch_main.cpp)
 target_link_libraries(catch_main PUBLIC CONAN_PKG::catch2)
+target_link_libraries(catch_main PRIVATE project_options)
 
 add_executable(tests tests.cpp)
 target_link_libraries(tests PRIVATE project_warnings project_options