diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 831b246d..196e470e 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -57,12 +57,12 @@ jobs:
 
     - name: build
       run: |
-        export CXXFLAGS=-Werror
         cmake -E make_directory build
         cmake -E chdir build cmake \
           -DCMAKE_CXX_COMPILER=${{ matrix.cpp-compiler }} \
           -DCMAKE_CXX_STANDARD=${{ matrix.cpp-standard }} \
           -G Ninja \
+          -DCUKE_STRICT=on \
           -DCUKE_ENABLE_BOOST_TEST=on \
           -DCUKE_ENABLE_GTEST=on \
           -DCUKE_ENABLE_QT_6=on \
diff --git a/.github/workflows/qt5.yml b/.github/workflows/qt5.yml
index a795d6fa..ceebcecd 100644
--- a/.github/workflows/qt5.yml
+++ b/.github/workflows/qt5.yml
@@ -51,10 +51,10 @@ jobs:
 
     - name: build
       run: |
-        export CXXFLAGS=-Werror
         cmake -E make_directory build
         cmake -E chdir build cmake \
           -G Ninja \
+          -DCUKE_STRICT=on \
           -DCUKE_ENABLE_BOOST_TEST=on \
           -DCUKE_ENABLE_GTEST=on \
           -DCUKE_ENABLE_QT_5=on \
diff --git a/.github/workflows/run-all.yml b/.github/workflows/run-all.yml
index dc1c83f3..879981ea 100644
--- a/.github/workflows/run-all.yml
+++ b/.github/workflows/run-all.yml
@@ -56,7 +56,6 @@ jobs:
 
     - name: build and run
       run: |
-        export CXXFLAGS=-Werror
         ./run-linux.sh
 
     - name: code coverage summary report
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b92ff49..b65dc2cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,7 @@ option(CUKE_CODE_COVERAGE       "Enable instrumentation for code coverage" OFF)
 set(CUKE_ENABLE_SANITIZER       "OFF" CACHE STRING "Sanitizer to use for checking")
 set_property(CACHE CUKE_ENABLE_SANITIZER PROPERTY STRINGS OFF "address" "thread" "undefined")
 option(CUKE_TESTS_VALGRIND      "Enable tests within Valgrind" OFF)
+option(CUKE_STRICT              "Additional and more strict checks" OFF)
 
 if(NOT DEFINED CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 17)
@@ -38,6 +39,10 @@ if(CUKE_CODE_COVERAGE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
 endif()
 
+if(CUKE_STRICT)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+endif()
+
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)
 
 #
diff --git a/run-linux.sh b/run-linux.sh
index 7f0c1730..62518385 100755
--- a/run-linux.sh
+++ b/run-linux.sh
@@ -8,6 +8,7 @@ export CTEST_OUTPUT_ON_FAILURE
 cmake -E make_directory build
 cmake -E chdir build cmake \
     -G Ninja \
+    -DCUKE_STRICT=on \
     -DCUKE_ENABLE_BOOST_TEST=on \
     -DCUKE_ENABLE_GTEST=on \
     -DCUKE_ENABLE_QT_6=on \