diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-04-05 17:15:25 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-04-05 17:15:25 +0200 |
| commit | ccee2cdbe8485ce8742f0dd99d3cfa642ff70a48 (patch) | |
| tree | 5800d67b33fb02c1dd5b2054ce45b96d996b78a3 /meson.build | |
| parent | b4a00487d7666a3f142e613b3c094952bfb7f2ec (diff) | |
| parent | b45d7a86484312692d5a7ac5bf98bc33fcd77f0d (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/meson.build b/meson.build index a2db302..a5f9061 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('shotwell', ['vala', 'c'], - version : '0.30.14', + version : '0.30.15', meson_version : '>= 0.43.0', default_options : ['buildtype=debugoptimized']) @@ -20,7 +20,8 @@ vapi_incdir = include_directories('vapi') shotwell_plugin_dir = join_paths(get_option('libdir'), 'shotwell', 'plugins', 'builtin') add_global_arguments(['-DHAVE_CONFIG_H=1'], - ['-include'], ['config.h'], language : 'c') + ['-include'], ['config.h'], + language : 'c') add_global_arguments(['--target-glib=2.40', '--vapidir=@0@'.format(join_paths(meson.current_source_dir(), 'vapi')), @@ -28,6 +29,8 @@ add_global_arguments(['--target-glib=2.40', '--enable-experimental', '--enable-deprecated'], language : 'vala') +version_h = vcs_tag(command: ['git', 'rev-parse', 'HEAD'], input: 'version.h.in', output: 'version.h', fallback: '') +version = declare_dependency(sources : version_h, include_directories : include_directories('.')) if get_option('fatal_warnings') add_global_arguments( [ @@ -37,12 +40,6 @@ if get_option('fatal_warnings') ) endif -gitver = run_command(find_program('git-hash')) -if gitver.returncode() == 0 - add_global_arguments(['-D_GIT_VERSION="@0@"'.format(gitver.stdout().strip())], - language : 'c') - add_global_arguments(['--define=_GITVERSION'], language : 'vala') -endif gtk = dependency('gtk+-3.0', version : '>= 3.22') gio = dependency('gio-2.0', version: '>= 2.40') @@ -67,6 +64,7 @@ endif libraw = dependency('libraw', version : '>= 0.13.2') libexif = dependency('libexif', version : '>= 0.6.16') unity = dependency('unity', required : false) +gdk = [ dependency('gdk-x11-3.0'), dependency('gdk-wayland-3.0') ] unity_available = false if unity.found() and get_option('unity-support') |