diff options
| author | Niels De Graef <nielsdegraef@gmail.com> | 2018-04-01 12:51:54 +0200 |
|---|---|---|
| committer | Niels De Graef <nielsdegraef@gmail.com> | 2018-04-01 12:51:54 +0200 |
| commit | 59c350aaf51b8f26b93130f4d0abe23d754f3827 (patch) | |
| tree | 3749d405f6f349feb9048491a576e807180f8235 | |
| parent | a8c618f8f6da5bbef3155f3d23ea1cdd58d808f6 (diff) | |
| download | gnome-contacts-59c350aaf51b8f26b93130f4d0abe23d754f3827.tar.gz | |
Meson: restructure to put the options at the top.
It's easier to keep them in sync with meson_options.txt this way.
| -rw-r--r-- | meson.build | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meson.build b/meson.build index 59dd6c0..09f9526 100644 --- a/meson.build +++ b/meson.build @@ -13,7 +13,13 @@ add_project_arguments( language: 'vala' ) -# Some variables +# Options +cheese_enabled = (get_option('with-cheese') != 'no') +telepathy_enabled = get_option('telepathy') +docs_enabled = get_option('docs') +manpage_enabled = get_option('with-manpage') + +# Common variables config_h_dir = include_directories('.') contacts_prefix = get_option('prefix') datadir = join_paths(contacts_prefix, get_option('datadir')) @@ -30,6 +36,8 @@ min_eds_version = '3.13.90' min_folks_version = '0.11.4' min_glib_version = '2.44' # We also use this value for --target-glib, so scratch the micro version. +math = meson.get_compiler('c').find_library('m') + folks = dependency('folks', version: '>=' + min_folks_version) folks_eds = dependency('folks-eds', version: '>=' + min_folks_version) gee = dependency('gee-0.8') @@ -43,11 +51,6 @@ libebook = dependency('libebook-1.2', version: '>=' + min_eds_version) libedataserver = dependency('libedataserver-1.2', version: '>=' + min_eds_version) libedataserverui = dependency('libedataserverui-1.2', version: '>=' + min_eds_version) -# Libraries -math = meson.get_compiler('c').find_library('m') - -# Options -cheese_enabled = (get_option('with-cheese') != 'no') if cheese_enabled cheese_required = (cheese_enabled == 'yes') cheese = dependency('cheese', required: cheese_required) @@ -55,16 +58,13 @@ if cheese_enabled cheese_enabled = cheese.found() and cheese_gtk.found() endif -telepathy_enabled = get_option('telepathy') if telepathy_enabled folks_telepathy = dependency('folks-telepathy', version: '>=' + min_folks_version) telepathy_glib = dependency('telepathy-glib', version: '>= 0.22.0') endif -docs_enabled = get_option('docs') valadoc = find_program('valadoc', required: docs_enabled) -manpage_enabled = get_option('with-manpage') # Configuration conf = configuration_data() |