[gimp/meson: 91/805] Fix missing dependencies over gitversion.h
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/meson: 91/805] Fix missing dependencies over gitversion.h
- Date: Fri, 2 Feb 2018 15:16:43 +0000 (UTC)
commit 374711d87f9687dbfda0c5768cf41c4177b9ab2f
Author: Félix Piédallu <felix piedallu me>
Date: Thu Nov 16 17:30:35 2017 +0100
Fix missing dependencies over gitversion.h
app/dialogs/meson.build | 1 +
app/display/meson.build | 1 +
app/meson.build | 45 ++++++++++++++++++++++-----------------------
3 files changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/app/dialogs/meson.build b/app/dialogs/meson.build
index 23d4ed8..00e52f0 100644
--- a/app/dialogs/meson.build
+++ b/app/dialogs/meson.build
@@ -43,6 +43,7 @@ libappdialogs_sources = [
'vectors-export-dialog.c',
'vectors-import-dialog.c',
'vectors-options-dialog.c',
+ gitversion_h,
]
# Auto-generated sources
diff --git a/app/display/meson.build b/app/display/meson.build
index 7b382fb..76f2820 100644
--- a/app/display/meson.build
+++ b/app/display/meson.build
@@ -81,6 +81,7 @@ libappdisplay_sources = [
'gimptoolsheargrid.c',
'gimptooltransformgrid.c',
'gimptoolwidget.c',
+ gitversion_h,
]
# TODO mkenums
diff --git a/app/meson.build b/app/meson.build
index f5f5273..e9dfd6b 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -1,5 +1,27 @@
rootAppInclude = include_directories('.')
+gitversion_h1 = vcs_tag(
+ input : 'git-version.h.in',
+ output: 'git-version.h.in.1',
+ command: [ 'git', 'describe', '--always', ],
+ replace_string: '@GIMP_GIT_VERSION@',
+ fallback: '',
+)
+gitversion_h2 = vcs_tag(
+ input : gitversion_h1,
+ output: 'git-version.h.in.2',
+ command: [ 'git', 'rev-parse', '--short', 'HEAD', ],
+ replace_string: '@GIMP_GIT_VERSION_ABBREV@',
+ fallback: '',
+)
+gitversion_h = vcs_tag(
+ input : gitversion_h2,
+ output: 'git-version.h',
+ command: [ 'git', 'log', '-n1', '--date=format:%Y', '--pretty=%cd', ],
+ replace_string: '@GIMP_GIT_LAST_COMMIT_YEAR@',
+ fallback: '',
+)
+
subdir('actions')
subdir('core')
subdir('dialogs')
@@ -52,29 +74,6 @@ if os_win32
# global_lflags += ['-export-symbols', 'gimpwidgets.def']
endif
-
-gitversion_h1 = vcs_tag(
- input : 'git-version.h.in',
- output: 'git-version.h.in.1',
- command: [ 'git', 'describe', '--always', ],
- replace_string: '@GIMP_GIT_VERSION@',
- fallback: '',
-)
-gitversion_h2 = vcs_tag(
- input : gitversion_h1,
- output: 'git-version.h.in.2',
- command: [ 'git', 'rev-parse', '--short', 'HEAD', ],
- replace_string: '@GIMP_GIT_VERSION_ABBREV@',
- fallback: '',
-)
-gitversion_h = vcs_tag(
- input : gitversion_h2,
- output: 'git-version.h',
- command: [ 'git', 'log', '-n1', '--date=format:%Y', '--pretty=%cd', ],
- replace_string: '@GIMP_GIT_LAST_COMMIT_YEAR@',
- fallback: '',
-)
-
libapp_sources = [
'app.c',
'errors.c',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]