Fix downstream issue with warnings

Signed-off-by: Ian <[email protected]>
Rinzii · Jan 25, 2025 · 7507508 · 7507508
1 parent 9629f6c
commit 7507508
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -93,7 +93,7 @@ jobs:
         run: sudo apt-get update -qq && sudo apt-get install -yqq --no-install-recommends ninja-build
 
       - name: Configure
-        run: cmake --preset="${{ matrix.configurePreset }}" -DCCMATH_DESIRED_CXX_STANDARD="cxx_std_${{ matrix.cxx_version }}"
+        run: cmake --preset="${{ matrix.configurePreset }}" -DCCMATH_ENABLE_AGGRESSIVE_WARNINGS=ON -DCCMATH_ENABLE_WARNINGS_AS_ERRORS=ON
 
       - name: Build
         run: cmake --build --preset="${{ matrix.buildPreset }}"

diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
@@ -89,7 +89,7 @@ jobs:
         run: brew install ninja
 
       - name: Configure
-        run: cmake --preset="${{ matrix.configurePreset }}" -DCCMATH_DESIRED_CXX_STANDARD="cxx_std_${{ matrix.cxx_version }}"
+        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
 
       - name: Build
         run: cmake --build --preset="${{ matrix.buildPreset }}"

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
@@ -62,7 +62,7 @@ jobs:
           key: ${{ runner.os }}-${{ matrix.name }}
 
       - name: Configure
-        run: cmake --preset="${{ matrix.configurePreset }}" -DCCMATH_DESIRED_CXX_STANDARD="cxx_std_${{ matrix.cxx_version }}"
+        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
 
       - name: Build
         run: cmake --build --preset="${{ matrix.buildPreset }}"

diff --git a/cmake/config/UserOptions.cmake b/cmake/config/UserOptions.cmake
@@ -60,21 +60,19 @@ option(CCMATH_DISABLE_CMAKE_BUILTIN_CHECKS
         "Disable the ability for CCMath to check for builtin functions at the CMake level"
         OFF)
 
-# Project-specific development options (Only enable if we are the root project)
-include(CMakeDependentOption)
-
-# Enforce aggressive warnings (enabled by default for the root project)
-cmake_dependent_option(CCMATH_ENABLE_AGGRESSIVE_WARNINGS
-        "Enforce extremely aggressive warnings." ON
-        "CCMATH_PROJECT_IS_TOP_LEVEL" ON
+option(CCMATH_ENABLE_AGGRESSIVE_WARNINGS
+        "Enforce extremely aggressive warnings."
+        OFF
 )
 
-# Treat warnings as errors (enabled by default for the root project)
-cmake_dependent_option(CCMATH_ENABLE_WARNINGS_AS_ERRORS
-        "All warnings should be treated as errors." ON
-        "CCMATH_PROJECT_IS_TOP_LEVEL" ON
+option(CCMATH_ENABLE_WARNINGS_AS_ERRORS
+        "All warnings should be treated as errors."
+        OFF
 )
 
+# Project-specific development options (Only enable if we are the root project)
+include(CMakeDependentOption)
+
 # Enable heightened debug information (disabled by default)
 cmake_dependent_option(CCMATH_ENABLE_DEBUG_INFO
         "Enable heightened debug information. Warning: this DOES have a performance cost." OFF