Merge pull request #77 from cpp-best-practices/c-cppcheck

Author: aminya

src/Standards.cmake

@@ -22,7 +22,10 @@ macro(set_standards)
   endif()
 
   if("{CMAKE_C_STANDARD}" STREQUAL "")
-    if(DEFINED CMAKE_C17_STANDARD_COMPILE_OPTION OR DEFINED CMAKE_C17_EXTENSION_COMPILE_OPTION)
+    if(NOT
+       ${ProjectOptions_ENABLE_CPPCHECK} # cppcheck doesn't support C17 https://sourceforge.net/p/cppcheck/discussion/general/thread/19ea152bba/
+       AND DEFINED CMAKE_C17_STANDARD_COMPILE_OPTION
+       OR DEFINED CMAKE_C17_EXTENSION_COMPILE_OPTION)
       set(C_LATEST_STANDARD 17)
     elseif(DEFINED CMAKE_C11_STANDARD_COMPILE_OPTION OR DEFINED CMAKE_C11_EXTENSION_COMPILE_OPTION)
       set(C_LATEST_STANDARD 11)

src/StaticAnalyzers.cmake

@@ -26,15 +26,27 @@ macro(enable_cppcheck CPPCHECK_OPTIONS)
       set(CMAKE_CXX_CPPCHECK ${CPPCHECK} --template=${CPPCHECK_TEMPLATE} ${CPPCHECK_OPTIONS})
     endif()
 
+    if(WARNINGS_AS_ERRORS)
+      list(APPEND CMAKE_CXX_CPPCHECK --error-exitcode=2)
+    endif()
+
+    # C cppcheck
+    set(CMAKE_C_CPPCHECK ${CMAKE_CXX_CPPCHECK})
+
     if(NOT
        "${CMAKE_CXX_STANDARD}"
        STREQUAL
        "")
       set(CMAKE_CXX_CPPCHECK ${CMAKE_CXX_CPPCHECK} --std=c++${CMAKE_CXX_STANDARD})
     endif()
-    if(WARNINGS_AS_ERRORS)
-      list(APPEND CMAKE_CXX_CPPCHECK --error-exitcode=2)
+
+    if(NOT
+       "${CMAKE_C_STANDARD}"
+       STREQUAL
+       "")
+      set(CMAKE_C_CPPCHECK ${CMAKE_C_CPPCHECK} --std=c${CMAKE_C_STANDARD})
     endif()
+
   else()
     message(${WARNING_MESSAGE} "cppcheck requested but executable not found")
   endif()