freshlybakedca.ke
Git fork
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
+9
-2
+3
-1
meson.build
+3
-1
meson.build
···
1513
1513
'version.c',
1514
1514
version_def_h,
1515
1515
],
1516
-
c_args: libgit_c_args,
1516
+
c_args: libgit_c_args + [
1517
+
'-DGIT_VERSION_H="' + version_def_h.full_path() + '"',
1518
+
],
1517
1519
dependencies: libgit_dependencies,
1518
1520
include_directories: libgit_include_directories,
1519
1521
)
+6
-1
version.c
+6
-1
version.c
···
1
1
#include "git-compat-util.h"
2
2
#include "version.h"
3
-
#include "version-def.h"
4
3
#include "strbuf.h"
4
+
5
+
#ifndef GIT_VERSION_H
6
+
# include "version-def.h"
7
+
#else
8
+
# include GIT_VERSION_H
9
+
#endif
5
10
6
11
const char git_version_string[] = GIT_VERSION;
7
12
const char git_built_from_commit_string[] = GIT_BUILT_FROM_COMMIT;