clang-tidy.yml: properly specify CMake option WARNINGS_ARE_ERRORS / mitigated -Wformat warnings (cppcheck-opensource#6841)

firewave · web-flow · commit c563801f1950 · 2024-09-29T15:16:00.000+02:00
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
@@ -54,7 +54,7 @@ jobs:
 
       - name: Prepare CMake
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCPPCHK_GLIBCXX_DEBUG=Off WARNINGS_ARE_ERRORS=On
+          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCPPCHK_GLIBCXX_DEBUG=Off -DWARNINGS_ARE_ERRORS=On
         env:
           CC: clang-19
           CXX: clang++-19
diff --git a/externals/tinyxml2/CMakeLists.txt b/externals/tinyxml2/CMakeLists.txt
@@ -17,5 +17,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     target_compile_options_safe(tinyxml2_objs -Wno-format-nonliteral)
     target_compile_options_safe(tinyxml2_objs -Wno-old-style-cast)
     target_compile_options_safe(tinyxml2_objs -Wno-inconsistent-missing-destructor-override)
+    target_compile_options_safe(tinyxml2_objs -Wno-format)
 endif()
 
diff --git a/lib/json.h b/lib/json.h
@@ -25,13 +25,15 @@ SUPPRESS_WARNING_PUSH("-Wfloat-equal")
 SUPPRESS_WARNING_CLANG_PUSH("-Wtautological-type-limit-compare")
 SUPPRESS_WARNING_CLANG_PUSH("-Wextra-semi-stmt")
 SUPPRESS_WARNING_CLANG_PUSH("-Wzero-as-null-pointer-constant")
+SUPPRESS_WARNING_CLANG_PUSH("-Wformat")
 
 #define PICOJSON_USE_INT64
 #include <picojson.h>
 
 SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_CLANG_POP
+SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_POP
 
 #endif // jsonH
