mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
49 lines
2.2 KiB
Diff
49 lines
2.2 KiB
Diff
From 3f30df763c2b0ac84b1c754faaedc69107539508 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <jbicha@ubuntu.com>
|
|
Date: Sun, 29 Mar 2026 17:02:56 -0700
|
|
Subject: [PATCH 2/3] cppcheck: Workaround undefined function-like macro for
|
|
GLIB_CHECK_VERSION
|
|
|
|
Copy a snippet from gtk.cfg.
|
|
|
|
I didn't include gtk.cfg directly because its config triggers
|
|
additional failures, so only copy the one line that we need
|
|
|
|
https://github.com/danmar/cppcheck/commit/8c762adcdd9e
|
|
|
|
https://bugs.debian.org/1125642
|
|
|
|
Closes: #106
|
|
---
|
|
tests/CMakeLists.txt | 2 +-
|
|
tests/ayatana.cfg | 5 +++++
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
create mode 100644 tests/ayatana.cfg
|
|
|
|
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
|
index bdc074f..97d6be0 100644
|
|
--- a/tests/CMakeLists.txt
|
|
+++ b/tests/CMakeLists.txt
|
|
@@ -28,7 +28,7 @@ endif()
|
|
|
|
add_compile_options(${CXX_WARNING_ARGS})
|
|
|
|
-add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --check-level=exhaustive --error-exitcode=2 --inline-suppr --library=qt -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=constParameterCallback --suppress=unusedFunction --suppress=uselessOverride)
|
|
+add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --check-level=exhaustive --error-exitcode=2 --inline-suppr --library=qt --library=${CMAKE_SOURCE_DIR}/tests/ayatana.cfg -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=constParameterCallback --suppress=unusedFunction --suppress=uselessOverride)
|
|
|
|
add_subdirectory (unit)
|
|
|
|
diff --git a/tests/ayatana.cfg b/tests/ayatana.cfg
|
|
new file mode 100644
|
|
index 0000000..035020a
|
|
--- /dev/null
|
|
+++ b/tests/ayatana.cfg
|
|
@@ -0,0 +1,5 @@
|
|
+<?xml version="1.0"?>
|
|
+<def format="2">
|
|
+ <!-- cppcheck override copied from gtk.cfg -->
|
|
+ <define name="GLIB_CHECK_VERSION(major, minor, micro)" value="1"/>
|
|
+</def>
|
|
--
|
|
2.43.0
|
|
|