Updated compiler identification

Using CMAKE_COMPILER_IS_GNUCC or CMAKE_COMPILER_IS_GNUCXX is deprecated,
and it is recommended to do string matching using CMAKE_C_COMPILER_ID or
CMAKE_CXX_COMPILER_ID instead, which is far more flexible.

Author: StableCoder

code-coverage.cmake

@@ -144,7 +144,8 @@ if(CODE_COVERAGE AND NOT CODE_COVERAGE_ADDED)
       COMMAND ;
       COMMENT "libs ready for coverage report.")
 
-  elseif(CMAKE_COMPILER_IS_GNUCXX)
+  elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" 
+          OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     # Messages
     message(STATUS "Building with lcov Code Coverage Tools")
 
@@ -259,7 +260,8 @@ function(target_code_coverage TARGET_NAME)
         ${TARGET_VISIBILITY}
         -fprofile-instr-generate
         -fcoverage-mapping)
-    elseif(CMAKE_COMPILER_IS_GNUCXX)
+    elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" 
+            OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
       target_compile_options(
         ${TARGET_NAME}
         ${TARGET_VISIBILITY}
@@ -370,7 +372,8 @@ function(target_code_coverage TARGET_NAME)
             -format="html" ${EXCLUDE_REGEX}
           DEPENDS ccov-processing-${target_code_coverage_COVERAGE_TARGET_NAME})
 
-      elseif(CMAKE_COMPILER_IS_GNUCXX)
+      elseif(CMAKE_C_COMPILER_ID MATCHES "GNU"
+              OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
         set(COVERAGE_INFO
             "${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/${target_code_coverage_COVERAGE_TARGET_NAME}.info"
         )
@@ -439,7 +442,8 @@ function(target_code_coverage TARGET_NAME)
         endif()
         add_dependencies(ccov ccov-${target_code_coverage_COVERAGE_TARGET_NAME})
 
-        if(NOT CMAKE_COMPILER_IS_GNUCXX)
+        if(NOT CMAKE_C_COMPILER_ID MATCHES "GNU"
+           OR NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU")
           if(NOT TARGET ccov-report)
             add_custom_target(ccov-report)
           endif()
@@ -473,7 +477,8 @@ function(add_code_coverage)
      OR CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?[Cc]lang")
     add_compile_options(-fprofile-instr-generate -fcoverage-mapping)
     add_link_options(-fprofile-instr-generate -fcoverage-mapping)
-  elseif(CMAKE_COMPILER_IS_GNUCXX)
+  elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" 
+          OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     add_compile_options(-fprofile-arcs -ftest-coverage)
     link_libraries(gcov)
   endif()
@@ -552,7 +557,8 @@ function(add_code_coverage_all_targets)
           -format="html" ${EXCLUDE_REGEX}
         DEPENDS ccov-all-processing)
 
-    elseif(CMAKE_COMPILER_IS_GNUCXX)
+    elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" 
+            OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
       set(COVERAGE_INFO "${CMAKE_COVERAGE_OUTPUT_DIRECTORY}/all-merged.info")
 
       # Nothing required for gcov

compiler-options.cmake

@@ -20,8 +20,8 @@ option(GENERATE_DEPENDENCY_DATA "Generates .d files with header dependencies"
        OFF)
 
 if(ENABLE_ALL_WARNINGS)
-  if(CMAKE_COMPILER_IS_GNUCC
-     OR CMAKE_COMPILER_IS_GNUCXX
+  if(CMAKE_C_COMPILER_ID MATCHES "GNU"
+     OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"
      OR CMAKE_C_COMPILER_ID MATCHES "(Apple)?[Cc]lang"
      OR CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?[Cc]lang")
     # GCC/Clang
@@ -33,17 +33,17 @@ if(ENABLE_ALL_WARNINGS)
 endif()
 
 if(ENABLE_EFFECTIVE_CXX)
-  if(CMAKE_COMPILER_IS_GNUCC
-     OR CMAKE_COMPILER_IS_GNUCXX
+  if(CMAKE_C_COMPILER_ID MATCHES "GNU"
+     OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"
      OR CMAKE_C_COMPILER_ID MATCHES "(Apple)?[Cc]lang"
      OR CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?[Cc]lang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weffc++")
   endif()
 endif()
 
 if(GENERATE_DEPENDENCY_DATA)
-  if(CMAKE_COMPILER_IS_GNUCC
-     OR CMAKE_COMPILER_IS_GNUCXX
+  if(CMAKE_C_COMPILER_ID MATCHES "GNU"
+     OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"
      OR CMAKE_C_COMPILER_ID MATCHES "(Apple)?[Cc]lang"
      OR CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?[Cc]lang")
     add_compile_options(-MD)