diff --git a/04-static-analysis/cppcheck-compile-commands/README.adoc b/04-static-analysis/cppcheck-compile-commands/README.adoc
index 838f258..cf22834 100644
--- a/04-static-analysis/cppcheck-compile-commands/README.adoc
+++ b/04-static-analysis/cppcheck-compile-commands/README.adoc
@@ -88,6 +88,18 @@ When cppcheck finds an error it can cause it to exit with a specific error. In t
 example, by default, it will exit with `1`. To change this you can set the 
 +CPPCHECK_ERROR_EXITCODE_ARG+ argument when running CMake.
 
+### Exitcode suppressions
+
+Sometimes you wish to display an error in the log, but to not have that error cause a failed build. To do this you can create a file `.cppcheck_exitcode_suppressions` and add suppressions to it. This file must be in your +CMAKE_SOURCE_DIR+
+
+### CppCheck arguments
+
+The default enabled checks are `--enabled=warning`. To change this you can override the `CPPCHECK_CHECK_ARGS` variable before calling `find(cppcheck)`.
+
+### Excluding files / folders
+
+Many projects include some vendored 3rd party code. To exclude this from you check you can create a list `CPPCHECK_EXCLUDES` before calling the find module. This will add all files and folders in the list into the list of excluded folders.
+
 ### CppCheck build dir
 
 In this example, we set +CPPCHECK_BUILD_DIR_ARG+, to `${PROJECT_BINARY_DIR}/analysis/cppcheck`. This will output details of the build to this folder and can be used to 
diff --git a/04-static-analysis/cppcheck-compile-commands/cmake/modules/FindCppCheck.cmake b/04-static-analysis/cppcheck-compile-commands/cmake/modules/FindCppCheck.cmake
index a86716a..8b6ed7e 100644
--- a/04-static-analysis/cppcheck-compile-commands/cmake/modules/FindCppCheck.cmake
+++ b/04-static-analysis/cppcheck-compile-commands/cmake/modules/FindCppCheck.cmake
@@ -15,7 +15,9 @@
 #   CPPCHECK_CHECKS_ARGS - The checks to run
 #   CPPCHECK_OTHER_ARGS - Any other arguments
 #   CPPCHECK_COMMAND - The full command to run the default cppcheck configuration
-#
+#   CPPCHECK_EXCLUDES - A list of files or folders to exclude from the scan. Must be the full path
+#   
+# if CPPCHECK_XML_OUTPUT is set before calling this. CppCheck will create an xml file with that name
 # find the cppcheck binary
 
 # if custom path check there first
@@ -39,14 +41,29 @@ if(CPPCHECK_BIN)
     set(CPPCHECK_THREADS_ARG "-j4" CACHE STRING "The number of threads to use")
     set(CPPCHECK_PROJECT_ARG "--project=${PROJECT_BINARY_DIR}/compile_commands.json")
     set(CPPCHECK_BUILD_DIR_ARG "--cppcheck-build-dir=${PROJECT_BINARY_DIR}/analysis/cppcheck" CACHE STRING "The build directory to use")
+    # Don't show thise errors
     if(EXISTS "${CMAKE_SOURCE_DIR}/.cppcheck_suppressions")
         set(CPPCHECK_SUPPRESSIONS "--suppressions-list=${CMAKE_SOURCE_DIR}/.cppcheck_suppressions" CACHE STRING "The suppressions file to use")
     else()
         set(CPPCHECK_SUPPRESSIONS "" CACHE STRING "The suppressions file to use")
     endif()
+
+    # Show these errors but don't fail the build
+    # These are mainly going to be from the "warning" category that is enabled by default later
+    if(EXISTS "${CMAKE_SOURCE_DIR}/.cppcheck_exitcode_suppressions")
+        set(CPPCHECK_EXITCODE_SUPPRESSIONS "--exitcode-suppressions=${CMAKE_SOURCE_DIR}/.cppcheck_exitcode_suppressions" CACHE STRING "The exitcode suppressions file to use")
+    else()
+        set(CPPCHECK_EXITCODE_SUPPRESSIONS "" CACHE STRING "The exitcode suppressions file to use")
+    endif()
+
     set(CPPCHECK_ERROR_EXITCODE_ARG "--error-exitcode=1" CACHE STRING "The exitcode to use if an error is found")
-    set(CPPCHECK_CHECKS_ARGS "" CACHE STRING "Arguments for the checks to run")
-    set(CPPCHECK_OTHER_ARGS "--quiet" CACHE STRING "Other arguments")
+    set(CPPCHECK_CHECKS_ARGS "--enable=warning" CACHE STRING "Arguments for the checks to run")
+    set(CPPCHECK_OTHER_ARGS "" CACHE STRING "Other arguments")
+    set(_CPPCHECK_EXCLUDES)
+
+    foreach(ex ${CPPCHECK_EXCLUDES})
+        list(APPEND _CPPCHECK_EXCLUDES "-i${ex}")
+    endforeach(ex)
 
     set(CPPCHECK_ALL_ARGS 
         ${CPPCHECK_THREADS_ARG} 
@@ -54,19 +71,30 @@ if(CPPCHECK_BIN)
         ${CPPCHECK_BUILD_DIR_ARG} 
         ${CPPCHECK_ERROR_EXITCODE_ARG} 
         ${CPPCHECK_SUPPRESSIONS} 
+        ${CPPCHECK_EXITCODE_SUPPRESSIONS}
         ${CPPCHECK_CHECKS_ARGS} 
         ${CPPCHECK_OTHER_ARGS}
+        ${_CPPCHECK_EXCLUDES}
     )
 
-    set(CPPCHECK_COMMAND 
-        ${CPPCHECK_BIN}
-        ${CPPCHECK_ALL_ARGS}
-    )
+    if(NOT CPPCHECK_XML_OUTPUT)
+        set(CPPCHECK_COMMAND 
+            ${CPPCHECK_BIN}
+            ${CPPCHECK_ALL_ARGS}
+        )
+    else()
+        set(CPPCHECK_COMMAND
+            ${CPPCHECK_BIN}
+            ${CPPCHECK_ALL_ARGS}
+            --xml 
+            --xml-version=2
+            2> ${CPPCHECK_XML_OUTPUT})
+    endif()
     
-    #TODO add version check on the binary
 endif()
 
 
+
 # handle the QUIETLY and REQUIRED arguments and set YAMLCPP_FOUND to TRUE if all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(
@@ -83,12 +111,3 @@ mark_as_advanced(
     CPPCHECK_SUPPRESSIONS
     CPPCHECK_CHECKS_ARGS
     CPPCHECK_OTHER_ARGS)
-
-if(CPPCHECK_FOUND)
-    file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/analysis/cppcheck)
-    add_custom_target(cppcheck-analysis 
-        COMMAND ${CPPCHECK_COMMAND})
-    message("cppcheck found. Use cppccheck-analysis targets to run it")
-else()
-    message("cppcheck not found. No cppccheck-analysis targets")
-endif()