Skip to content

Commit 7507508

Browse files
committed
Fix downstream issue with warnings
Signed-off-by: Ian <[email protected]>
1 parent 9629f6c commit 7507508

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

.github/workflows/ci-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
run: sudo apt-get update -qq && sudo apt-get install -yqq --no-install-recommends ninja-build
9494

9595
- name: Configure
96-
run: cmake --preset="${{ matrix.configurePreset }}" -DCCMATH_DESIRED_CXX_STANDARD="cxx_std_${{ matrix.cxx_version }}"
96+
run: cmake --preset="${{ matrix.configurePreset }}" -DCCMATH_ENABLE_AGGRESSIVE_WARNINGS=ON -DCCMATH_ENABLE_WARNINGS_AS_ERRORS=ON
9797

9898
- name: Build
9999
run: cmake --build --preset="${{ matrix.buildPreset }}"

.github/workflows/ci-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
run: brew install ninja
9090

9191
- name: Configure
92-
run: cmake --preset="${{ matrix.configurePreset }}" -DCCMATH_DESIRED_CXX_STANDARD="cxx_std_${{ matrix.cxx_version }}"
92+
run: cmake --preset="${{ matrix.configurePreset }}" -DCCMATH_DESIRED_CXX_STANDARD="cxx_std_${{ matrix.cxx_version }}" -DCCMATH_ENABLE_AGGRESSIVE_WARNINGS=ON -DCCMATH_ENABLE_WARNINGS_AS_ERRORS=ON
9393

9494
- name: Build
9595
run: cmake --build --preset="${{ matrix.buildPreset }}"

.github/workflows/ci-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
key: ${{ runner.os }}-${{ matrix.name }}
6363

6464
- name: Configure
65-
run: cmake --preset="${{ matrix.configurePreset }}" -DCCMATH_DESIRED_CXX_STANDARD="cxx_std_${{ matrix.cxx_version }}"
65+
run: cmake --preset="${{ matrix.configurePreset }}" -DCCMATH_DESIRED_CXX_STANDARD="cxx_std_${{ matrix.cxx_version }}" -DCCMATH_ENABLE_AGGRESSIVE_WARNINGS=ON -DCCMATH_ENABLE_WARNINGS_AS_ERRORS=ON
6666

6767
- name: Build
6868
run: cmake --build --preset="${{ matrix.buildPreset }}"

cmake/config/UserOptions.cmake

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,19 @@ option(CCMATH_DISABLE_CMAKE_BUILTIN_CHECKS
6060
"Disable the ability for CCMath to check for builtin functions at the CMake level"
6161
OFF)
6262

63-
# Project-specific development options (Only enable if we are the root project)
64-
include(CMakeDependentOption)
65-
66-
# Enforce aggressive warnings (enabled by default for the root project)
67-
cmake_dependent_option(CCMATH_ENABLE_AGGRESSIVE_WARNINGS
68-
"Enforce extremely aggressive warnings." ON
69-
"CCMATH_PROJECT_IS_TOP_LEVEL" ON
63+
option(CCMATH_ENABLE_AGGRESSIVE_WARNINGS
64+
"Enforce extremely aggressive warnings."
65+
OFF
7066
)
7167

72-
# Treat warnings as errors (enabled by default for the root project)
73-
cmake_dependent_option(CCMATH_ENABLE_WARNINGS_AS_ERRORS
74-
"All warnings should be treated as errors." ON
75-
"CCMATH_PROJECT_IS_TOP_LEVEL" ON
68+
option(CCMATH_ENABLE_WARNINGS_AS_ERRORS
69+
"All warnings should be treated as errors."
70+
OFF
7671
)
7772

73+
# Project-specific development options (Only enable if we are the root project)
74+
include(CMakeDependentOption)
75+
7876
# Enable heightened debug information (disabled by default)
7977
cmake_dependent_option(CCMATH_ENABLE_DEBUG_INFO
8078
"Enable heightened debug information. Warning: this DOES have a performance cost." OFF

0 commit comments

Comments
 (0)