Merge branch 'ps/meson-clar-decls-fix'

gitster · gitster · commit c4c628f6617a · 2025-08-04T08:10:34.000-07:00
Build fix.

* ps/meson-clar-decls-fix:
  meson: ensure correct "clar-decls.h" header is used
diff --git a/t/meson.build b/t/meson.build
@@ -59,6 +59,9 @@ clar_sources += custom_target(
 
 clar_unit_tests = executable('unit-tests',
   sources: clar_sources + clar_test_suites,
+  c_args: [
+    '-DGIT_CLAR_DECLS_H="' + clar_decls_h.full_path() + '"',
+  ],
   dependencies: [libgit_commonmain],
 )
 test('unit-tests', clar_unit_tests, kwargs: test_kwargs)
diff --git a/t/unit-tests/unit-test.h b/t/unit-tests/unit-test.h
@@ -1,8 +1,13 @@
 #include "git-compat-util.h"
 #include "clar/clar.h"
-#include "clar-decls.h"
 #include "strbuf.h"
 
+#ifndef GIT_CLAR_DECLS_H
+# include "clar-decls.h"
+#else
+# include GIT_CLAR_DECLS_H
+#endif
+
 #define cl_failf(fmt, ...) do { \
 	char desc[4096]; \
 	snprintf(desc, sizeof(desc), fmt, __VA_ARGS__); \

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,9 @@ clar_sources += custom_target(`
`59`	`59`
`60`	`60`	`clar_unit_tests = executable('unit-tests',`
`61`	`61`	`sources: clar_sources + clar_test_suites,`
	`62`	`+ c_args: [`
	`63`	`+ '-DGIT_CLAR_DECLS_H="' + clar_decls_h.full_path() + '"',`
	`64`	`+ ],`
`62`	`65`	`dependencies: [libgit_commonmain],`
`63`	`66`	`)`
`64`	`67`	`test('unit-tests', clar_unit_tests, kwargs: test_kwargs)`