Skip to content

Commit 8f662ea

Browse files
authored
Merge pull request #310 from iQiliO/strict-option
refactoring: use CMake option for strict checks
2 parents 647b614 + 938f351 commit 8f662ea

File tree

5 files changed

+8
-3
lines changed

5 files changed

+8
-3
lines changed

.github/workflows/linux-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ jobs:
5757
5858
- name: build
5959
run: |
60-
export CXXFLAGS=-Werror
6160
cmake -E make_directory build
6261
cmake -E chdir build cmake \
6362
-DCMAKE_CXX_COMPILER=${{ matrix.cpp-compiler }} \
6463
-DCMAKE_CXX_STANDARD=${{ matrix.cpp-standard }} \
6564
-G Ninja \
65+
-DCUKE_STRICT=on \
6666
-DCUKE_ENABLE_BOOST_TEST=on \
6767
-DCUKE_ENABLE_GTEST=on \
6868
-DCUKE_ENABLE_QT_6=on \

.github/workflows/qt5.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ jobs:
5151
5252
- name: build
5353
run: |
54-
export CXXFLAGS=-Werror
5554
cmake -E make_directory build
5655
cmake -E chdir build cmake \
5756
-G Ninja \
57+
-DCUKE_STRICT=on \
5858
-DCUKE_ENABLE_BOOST_TEST=on \
5959
-DCUKE_ENABLE_GTEST=on \
6060
-DCUKE_ENABLE_QT_5=on \

.github/workflows/run-all.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ jobs:
5656
5757
- name: build and run
5858
run: |
59-
export CXXFLAGS=-Werror
6059
./run-linux.sh
6160
6261
- name: code coverage summary report

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ option(CUKE_CODE_COVERAGE "Enable instrumentation for code coverage" OFF)
2525
set(CUKE_ENABLE_SANITIZER "OFF" CACHE STRING "Sanitizer to use for checking")
2626
set_property(CACHE CUKE_ENABLE_SANITIZER PROPERTY STRINGS OFF "address" "thread" "undefined")
2727
option(CUKE_TESTS_VALGRIND "Enable tests within Valgrind" OFF)
28+
option(CUKE_STRICT "Additional and more strict checks" OFF)
2829

2930
if(NOT DEFINED CMAKE_CXX_STANDARD)
3031
set(CMAKE_CXX_STANDARD 17)
@@ -38,6 +39,10 @@ if(CUKE_CODE_COVERAGE)
3839
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
3940
endif()
4041

42+
if(CUKE_STRICT)
43+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
44+
endif()
45+
4146
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)
4247

4348
#

run-linux.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export CTEST_OUTPUT_ON_FAILURE
88
cmake -E make_directory build
99
cmake -E chdir build cmake \
1010
-G Ninja \
11+
-DCUKE_STRICT=on \
1112
-DCUKE_ENABLE_BOOST_TEST=on \
1213
-DCUKE_ENABLE_GTEST=on \
1314
-DCUKE_ENABLE_QT_6=on \

0 commit comments

Comments
 (0)