update

markaren · Jul 1, 2024 · 921ebed · 921ebed
1 parent dd57aea
commit 921ebed
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -131,7 +131,7 @@ jobs:
 
       - name: Configure and build
         run: |
-          cmake . -A x64 -B build -DCMAKE_BUILD_TYPE="Release"
+          cmake . -A x64 -B build -DTHREEPP_TREAT_WARNINGS_AS_ERRORS=ON -DCMAKE_BUILD_TYPE="Release"
           cmake --build build --config Release
 
       - name: Test

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@ option(THREEPP_BUILD_EXAMPLES "Build examples" ON)
 option(THREEPP_BUILD_TESTS "Build test suite" ON)
 option(THREEPP_WITH_SVG "Build with SVGLoader" ON)
 option(THREEPP_WITH_AUDIO "Build with Audio" ON)
-option(THREEPP_TREAT_WARNINGS_AS_ERRORS "Treat warnings as errors" ON)
+option(THREEPP_TREAT_WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
 
 # Force THREEPP_WITH_GLFW ON when targeting Emscripten
 cmake_dependent_option(THREEPP_WITH_GLFW "Build with GLFW frontend" ON "NOT DEFINED EMSCRIPTEN" ON)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -537,7 +537,7 @@ endif ()
 if (THREEPP_TREAT_WARNINGS_AS_ERRORS)
     # Treat warnings as errors,
     if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-        target_compile_options(threepp PRIVATE "-Wall" "-Wextra" "-Wpedantic")
+        target_compile_options(threepp PRIVATE "-Wall" "-Wextra")
         target_compile_options(threepp PRIVATE
                 "-Wno-parentheses" "-Wno-reorder" "-Wno-reorder-ctor"
                 "-Wno-missing-field-initializers" "-Wno-overloaded-virtual"