aboutsummaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-01-23 15:07:01 -0800
committerJunio C Hamano <gitster@pobox.com>2025-01-23 15:07:01 -0800
commitd8093fd6c192d900082eb8d78a385ca1e13effa8 (patch)
tree4e938825ed59830afa28e6f2e5860718808f9397 /meson.build
parent7e3cb2e515ea2e2bc11d80bdb9a20f0daebc19a2 (diff)
parent4771501c0a125dd3560391cbd716c63a281e8244 (diff)
downloadgit-d8093fd6c192d900082eb8d78a385ca1e13effa8.tar.xz
Merge branch 'tc/meson-use-our-version-def-h'
The meson build procedure looked for the 'version-def.h' file in a wrong directory, which has been corrected. * tc/meson-use-our-version-def-h: meson: ensure correct version-def.h is used
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build4
1 files changed, 3 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 7361eb2eaa..623caf7d5e 100644
--- a/meson.build
+++ b/meson.build
@@ -1513,7 +1513,9 @@ libgit_version_library = static_library('git-version',
'version.c',
version_def_h,
],
- c_args: libgit_c_args,
+ c_args: libgit_c_args + [
+ '-DGIT_VERSION_H="' + version_def_h.full_path() + '"',
+ ],
dependencies: libgit_dependencies,
include_directories: libgit_include_directories,
)