diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e2743898e2169510626bfa3211144f3961d223d..76441efb5d136cd9d5ca9cda21a3f92cebceb33c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,4 +82,17 @@ benchmark_Include_what_you_use:
     - cd $CI_PROJECT_DIR/build
     - rm -r ./*
     - cmake .. -DBUILD_VF_CPU=ON -DUSE_OPENMP=OFF -DBUILD_VF_INCLUDE_WHAT_YOU_USE=ON
-    - make
\ No newline at end of file
+    - make
+
+
+benchmark_cppcheck:
+  stage: deploy
+
+  before_script:
+    - export DEBIAN_FRONTEND=noninteractive
+    - apt-get update
+    - apt-get install cppcheck
+
+  script:
+    - cd $CI_PROJECT_DIR
+    - cppcheck src --enable=all
diff --git a/CMake/VirtualFluidsMacros.cmake b/CMake/VirtualFluidsMacros.cmake
index 14309caeb84668682f7ae013fead67b248f0e53c..6b7964dfda94853bbae5dad298895cfcbb58b50f 100644
--- a/CMake/VirtualFluidsMacros.cmake
+++ b/CMake/VirtualFluidsMacros.cmake
@@ -173,6 +173,21 @@ function(vf_add_library)
         status_lib("include-what-you-use enabled")
     endif()
 
+    # cppcheck
+    if(BUILD_VF_CPPCHECK)
+        find_program(CPPCHECK_PROGRAM NAMES cppcheck)
+
+        if(NOT CPPCHECK_PROGRAM)
+            message(FATAL_ERROR "Could not find the program cppcheck")
+        endif()
+
+        set_target_properties(${library_name}
+                PROPERTIES
+                CXX_CPPCHECK "${CPPCHECK_PROGRAM};--enable=all")
+
+        status_lib("cppcheck enabled")
+    endif()
+
     #################################################################
     ###   ADDITIONAL LINK LIBRARIES                               ###
     #################################################################
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6176bae09f384c35a01a025e3f0f5fc6ffc0858..e1540fd0a319739662cc2f50013da4f8975257c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,7 @@ option(BUILD_VF_GPU "Build VirtualFluids gpu variant" OFF)
 option(BUILD_VF_UNIT_TESTS "Build VirtualFluids unit tests" OFF)
 option(BUILD_VF_CLANG_TIDY "Add the clang tidy checks to the targets" OFF)
 option(BUILD_VF_INCLUDE_WHAT_YOU_USE "Add IWYU to the targets" OFF)
+option(BUILD_VF_CPPCHECK "Add cppcheck to the targets" OFF)
 
 option(BUILD_SHARED_LIBS "" ON)