Skip to content

Commit 6381e50

Browse files
Merge branch 'danmar:main' into chr_14546
2 parents 39973d1 + a1e752f commit 6381e50

254 files changed

Lines changed: 6541 additions & 5058 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.clang-tidy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ Checks: >
4242
-modernize-avoid-c-arrays,
4343
-modernize-deprecated-ios-base-aliases,
4444
-misc-include-cleaner,
45+
-misc-multiple-inheritance,
4546
-misc-unused-using-decls,
47+
-modernize-avoid-c-style-cast,
4648
-modernize-loop-convert,
4749
-modernize-macro-to-enum,
4850
-modernize-raw-string-literal,
@@ -68,6 +70,7 @@ Checks: >
6870
-readability-identifier-length,
6971
-readability-identifier-naming,
7072
-readability-implicit-bool-conversion,
73+
-readability-inconsistent-ifelse-braces,
7174
-readability-isolate-declaration,
7275
-readability-magic-numbers,
7376
-readability-redundant-parentheses,
@@ -87,3 +90,5 @@ CheckOptions:
8790
value: false
8891
- key: misc-override-with-different-visibility.DisallowedVisibilityChange
8992
value: widening
93+
- key: misc-use-internal-linkage.AnalyzeTypes
94+
value: false

.github/workflows/CI-unixish-docker.yml

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,16 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
image: ["ubuntu:24.04", "ubuntu:25.10"]
23+
include:
24+
- image: "ubuntu:24.04"
25+
with_gui: true
26+
full_build: true
27+
- image: "ubuntu:25.10"
28+
with_gui: true
29+
full_build: true
30+
- image: "alpine:3.23"
31+
with_gui: false # it appears FindQt6.cmake is not provided by any package
32+
full_build: false # FIXME: test-signalhandler.cpp fails to build since feenableexcept() is missing
2433
fail-fast: false # Prefer quick result
2534

2635
runs-on: ubuntu-22.04
@@ -45,9 +54,15 @@ jobs:
4554
apt-get install -y cmake g++ make libxml2-utils libpcre3-dev
4655
4756
- name: Install missing software (gui) on latest ubuntu
57+
if: contains(matrix.image, 'ubuntu')
4858
run: |
4959
apt-get install -y qt6-base-dev qt6-charts-dev qt6-tools-dev
5060
61+
- name: Install missing software on Alpine
62+
if: contains(matrix.image, 'alpine')
63+
run: |
64+
apk add cmake make g++ pcre-dev
65+
5166
# needs to be called after the package installation since
5267
# - it doesn't call "apt-get update"
5368
- name: ccache
@@ -57,9 +72,10 @@ jobs:
5772

5873
- name: Run CMake
5974
run: |
60-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
75+
cmake -S . -B cmake.output -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=${{ matrix.with_gui }} -DWITH_QCHART=On -DBUILD_TRIAGE=${{ matrix.with_gui }} -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
6176
62-
- name: CMake build (with GUI)
77+
- name: CMake build
78+
if: matrix.full_build
6379
run: |
6480
cmake --build cmake.output -- -j$(nproc)
6581
@@ -71,7 +87,7 @@ jobs:
7187

7288
strategy:
7389
matrix:
74-
image: ["ubuntu:24.04", "ubuntu:25.10"]
90+
image: ["ubuntu:24.04", "ubuntu:25.10", "alpine:3.23"]
7591
fail-fast: false # Prefer quick result
7692

7793
runs-on: ubuntu-22.04
@@ -90,21 +106,28 @@ jobs:
90106
apt-get update
91107
apt-get install -y g++ make python3 libxml2-utils libpcre3-dev
92108
109+
- name: Install missing software on Alpine
110+
if: contains(matrix.image, 'alpine')
111+
run: |
112+
apk add make g++ pcre-dev bash python3 libxml2-utils
113+
93114
# needs to be called after the package installation since
94115
# - it doesn't call "apt-get update"
95116
- name: ccache
96117
uses: hendrikmuhs/ccache-action@v1.2
97118
with:
98119
key: ${{ github.workflow }}-${{ matrix.image }}
99120

121+
# /usr/lib/ccache/bin - Alpine Linux
122+
100123
- name: Build cppcheck
101124
run: |
102-
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
125+
export PATH="/usr/lib/ccache/bin:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
103126
make -j$(nproc) HAVE_RULES=yes CXXOPTS="-Werror"
104127
105128
- name: Build test
106129
run: |
107-
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
130+
export PATH="/usr/lib/ccache/bin:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
108131
make -j$(nproc) HAVE_RULES=yes CXXOPTS="-Werror" testrunner
109132
110133
- name: Run test

.github/workflows/CI-unixish.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ jobs:
5858
- name: CMake build on ubuntu (with GUI / system tinyxml2)
5959
if: contains(matrix.os, 'ubuntu')
6060
run: |
61-
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
61+
cmake -S . -B cmake.output.tinyxml2 -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
6262
cmake --build cmake.output.tinyxml2 -- -j$(nproc)
6363
6464
- name: CMake build on macos (with GUI / system tinyxml2)
6565
if: contains(matrix.os, 'macos')
6666
run: |
67-
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
67+
cmake -S . -B cmake.output.tinyxml2 -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
6868
cmake --build cmake.output.tinyxml2 -- -j$(nproc)
6969
7070
- name: Run CMake test (system tinyxml2)
@@ -127,12 +127,12 @@ jobs:
127127
- name: Run CMake on ubuntu (with GUI)
128128
if: contains(matrix.os, 'ubuntu')
129129
run: |
130-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install
130+
cmake -S . -B cmake.output -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install
131131
132132
- name: Run CMake on macos (with GUI)
133133
if: contains(matrix.os, 'macos')
134134
run: |
135-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
135+
cmake -S . -B cmake.output -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
136136
137137
- name: Run CMake build
138138
run: |
@@ -154,13 +154,13 @@ jobs:
154154
- name: Run CMake on ubuntu (no CLI)
155155
if: matrix.os == 'ubuntu-22.04'
156156
run: |
157-
cmake -S . -B cmake.output_nocli -G "Unix Makefiles" -DBUILD_TESTING=Off -DBUILD_CLI=Off
157+
cmake -S . -B cmake.output_nocli -Werror=dev -DBUILD_TESTING=Off -DBUILD_CLI=Off
158158
159159
- name: Run CMake on ubuntu (no CLI / with tests)
160160
if: matrix.os == 'ubuntu-22.04'
161161
run: |
162162
# the test and CLI code are too intertwined so for now we need to reject that
163-
if cmake -S . -B cmake.output_nocli_tests -G "Unix Makefiles" -DBUILD_TESTING=On -DBUILD_CLI=Off; then
163+
if cmake -S . -B cmake.output_nocli_tests -Werror=dev -DBUILD_TESTING=On -DBUILD_CLI=Off; then
164164
exit 1
165165
else
166166
exit 0
@@ -169,18 +169,18 @@ jobs:
169169
- name: Run CMake on ubuntu (no CLI / with GUI)
170170
if: matrix.os == 'ubuntu-22.04'
171171
run: |
172-
cmake -S . -B cmake.output_nocli_gui -G "Unix Makefiles" -DBUILD_TESTING=Off -DBUILD_CLI=Off -DBUILD_GUI=On
172+
cmake -S . -B cmake.output_nocli_gui -Werror=dev -DBUILD_TESTING=Off -DBUILD_CLI=Off -DBUILD_GUI=On
173173
174174
- name: Run CMake on ubuntu (no GUI)
175175
if: matrix.os == 'ubuntu-22.04'
176176
run: |
177-
cmake -S . -B cmake.output_nogui -G "Unix Makefiles" -DBUILD_TESTING=Off -DBUILD_GUI=Off
177+
cmake -S . -B cmake.output_nogui -Werror=dev -DBUILD_TESTING=Off -DBUILD_GUI=Off
178178
179179
- name: Run CMake on ubuntu (no GUI / with triage)
180180
if: matrix.os == 'ubuntu-22.04'
181181
run: |
182182
# cannot build triage without GUI
183-
if cmake -S . -B cmake.output_nogui_triage -G "Unix Makefiles" -DBUILD_TESTING=Off -DBUILD_GUI=Off -DBUILD_TRIAGE=On; then
183+
if cmake -S . -B cmake.output_nogui_triage -Werror=dev -DBUILD_TESTING=Off -DBUILD_GUI=Off -DBUILD_TRIAGE=On; then
184184
exit 1
185185
else
186186
exit 0
@@ -189,7 +189,7 @@ jobs:
189189
- name: Run CMake on ubuntu (no CLI / no GUI)
190190
if: matrix.os == 'ubuntu-22.04'
191191
run: |
192-
cmake -S . -B cmake.output_nocli_nogui -G "Unix Makefiles" -DBUILD_TESTING=Off -DBUILD_GUI=Off
192+
cmake -S . -B cmake.output_nocli_nogui -Werror=dev -DBUILD_TESTING=Off -DBUILD_GUI=Off
193193
194194
build_cmake_cxxstd:
195195

@@ -243,12 +243,12 @@ jobs:
243243
- name: Run CMake on ubuntu (with GUI)
244244
if: contains(matrix.os, 'ubuntu')
245245
run: |
246-
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
246+
cmake -S . -B cmake.output -Werror=dev -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
247247
248248
- name: Run CMake on macos (with GUI)
249249
if: contains(matrix.os, 'macos')
250250
run: |
251-
cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
251+
cmake -S . -B cmake.output -Werror=dev -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt6_DIR=$(brew --prefix qt@6)/lib/cmake/Qt6
252252
253253
- name: Run CMake build
254254
run: |
@@ -373,7 +373,7 @@ jobs:
373373
run: |
374374
# make sure we fail when Boost is requested and not available.
375375
# will fail because no package configuration is available.
376-
if cmake -S . -B cmake.output.boost-force-noavail -G "Unix Makefiles" -DBUILD_TESTING=Off -DUSE_BOOST=On; then
376+
if cmake -S . -B cmake.output.boost-force-noavail -Werror=dev -DBUILD_TESTING=Off -DUSE_BOOST=On; then
377377
exit 1
378378
else
379379
exit 0
@@ -386,12 +386,12 @@ jobs:
386386
387387
- name: Run CMake on macOS (force Boost)
388388
run: |
389-
cmake -S . -B cmake.output.boost-force -G "Unix Makefiles" -DBUILD_TESTING=Off -DUSE_BOOST=On
389+
cmake -S . -B cmake.output.boost-force -Werror=dev -DBUILD_TESTING=Off -DUSE_BOOST=On
390390
391391
- name: Run CMake on macOS (no Boost)
392392
run: |
393393
# make sure Boost is not used when disabled even though it is available
394-
cmake -S . -B cmake.output.boost-no -G "Unix Makefiles" -DBUILD_TESTING=Off -DUSE_BOOST=Off
394+
cmake -S . -B cmake.output.boost-no -Werror=dev -DBUILD_TESTING=Off -DUSE_BOOST=Off
395395
if grep -q '\-DHAVE_BOOST' ./cmake.output.boost-no/compile_commands.json; then
396396
exit 1
397397
else
@@ -400,7 +400,7 @@ jobs:
400400
401401
- name: Run CMake on macOS (with Boost)
402402
run: |
403-
cmake -S . -B cmake.output.boost -G "Unix Makefiles" -DBUILD_TESTING=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
403+
cmake -S . -B cmake.output.boost -Werror=dev -DBUILD_TESTING=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
404404
grep -q '\-DHAVE_BOOST' ./cmake.output.boost/compile_commands.json
405405
406406
- name: Build with CMake on macOS (with Boost)
@@ -436,12 +436,12 @@ jobs:
436436
- name: Run CMake (without GUI)
437437
run: |
438438
export PATH=cmake-${{ env.CMAKE_VERSION_FULL }}-linux-x86_64/bin:$PATH
439-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTING=On
439+
cmake -S . -B cmake.output -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On
440440
441441
- name: Run CMake (with GUI)
442442
run: |
443443
export PATH=cmake-${{ env.CMAKE_VERSION_FULL }}-linux-x86_64/bin:$PATH
444-
cmake -S . -B cmake.output.gui -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On
444+
cmake -S . -B cmake.output.gui -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On
445445
446446
build:
447447

@@ -596,7 +596,7 @@ jobs:
596596
597597
- name: Test Signalhandler
598598
run: |
599-
cmake -S . -B build.cmake.signal -G "Unix Makefiles" -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On
599+
cmake -S . -B build.cmake.signal -Werror=dev -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On
600600
cmake --build build.cmake.signal --target test-signalhandler -- -j$(nproc)
601601
# TODO: how to run this without copying the file?
602602
cp build.cmake.signal/bin/test-s* .
@@ -607,7 +607,7 @@ jobs:
607607
- name: Test Stacktrace
608608
if: contains(matrix.os, 'ubuntu')
609609
run: |
610-
cmake -S . -B build.cmake.stack -G "Unix Makefiles" -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On
610+
cmake -S . -B build.cmake.stack -Werror=dev -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On
611611
cmake --build build.cmake.stack --target test-stacktrace -- -j$(nproc)
612612
# TODO: how to run this without copying the file?
613613
cp build.cmake.stack/bin/test-s* .
@@ -721,7 +721,7 @@ jobs:
721721
722722
- name: CMake
723723
run: |
724-
cmake -S . -B cmake.output -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On
724+
cmake -S . -B cmake.output -Werror=dev -DHAVE_RULES=On -DBUILD_TESTING=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_MATCHCOMPILER=Verify -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DDISABLE_DMAKE=On
725725
726726
- name: Generate dependencies
727727
run: |

.github/workflows/CI-windows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
run: |
5454
rem TODO: enable rules?
5555
rem specify Release build so matchcompiler is used
56-
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DBUILD_TESTING=Off -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DBUILD_ONLINE_HELP=On -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
56+
cmake -S . -B build -Werror=dev -DCMAKE_BUILD_TYPE=Release -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DBUILD_TESTING=Off -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DBUILD_ONLINE_HELP=On -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
5757
5858
- name: Build GUI release
5959
run: |
@@ -92,7 +92,7 @@ jobs:
9292

9393
- name: Run CMake
9494
run: |
95-
cmake -S . -B build.cxxstd -G "Visual Studio 17 2022" -A x64 -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
95+
cmake -S . -B build.cxxstd -Werror=dev -G "Visual Studio 17 2022" -A x64 -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
9696
9797
- name: Build
9898
run: |
@@ -192,7 +192,7 @@ jobs:
192192
7z x pcre-%PCRE_VERSION%.zip || exit /b !errorlevel!
193193
cd pcre-%PCRE_VERSION% || exit /b !errorlevel!
194194
git apply --ignore-space-change ..\externals\pcre.patch || exit /b !errorlevel!
195-
cmake . -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DPCRE_BUILD_PCRECPP=Off -DPCRE_BUILD_TESTING=Off -DPCRE_BUILD_PCREGREP=Off -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
195+
cmake . -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DPCRE_BUILD_PCRECPP=Off -DPCRE_BUILD_TESTS=Off -DPCRE_BUILD_PCREGREP=Off -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
196196
nmake || exit /b !errorlevel!
197197
copy pcre.h ..\externals || exit /b !errorlevel!
198198
copy pcre.lib ..\externals\pcre64.lib || exit /b !errorlevel!
@@ -272,7 +272,7 @@ jobs:
272272
- name: Test SEH wrapper
273273
if: matrix.config == 'release'
274274
run: |
275-
cmake -S . -B build.cmake.seh -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
275+
cmake -S . -B build.cmake.seh -Werror=dev -DBUILD_TESTING=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
276276
cmake --build build.cmake.seh --target test-sehwrapper || exit /b !errorlevel!
277277
:: TODO: how to run this without copying the file?
278278
copy build.cmake.seh\bin\Debug\test-sehwrapper.exe . || exit /b !errorlevel!

0 commit comments

Comments
 (0)