diff options
author | Zeeshan Ali <zeenix@collabora.co.uk> | 2018-07-09 15:53:49 +0200 |
---|---|---|
committer | Zeeshan Ali <zeenix@collabora.co.uk> | 2018-07-09 15:53:49 +0200 |
commit | 771f3048b9c9cb6489e782dd80c214f3ab595a42 (patch) | |
tree | 6e4a05be172181356e2b90324a2fda02fe6cbcff | |
parent | 53e6c066bf4bd853387564294127cbf21b95ecce (diff) | |
download | geoclue-771f3048b9c9cb6489e782dd80c214f3ab595a42.tar.gz |
meson: Simpler meson options
Remove 'enable-' prefix from most options.
-rw-r--r-- | data/meson.build | 2 | ||||
-rw-r--r-- | demo/meson.build | 4 | ||||
-rw-r--r-- | libgeoclue/meson.build | 2 | ||||
-rw-r--r-- | meson.build | 4 | ||||
-rw-r--r-- | meson_options.txt | 18 | ||||
-rw-r--r-- | src/meson.build | 14 |
6 files changed, 22 insertions, 22 deletions
diff --git a/data/meson.build b/data/meson.build index bc65c0e..3fdba43 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,7 +1,7 @@ if get_option('enable-backend') conf = configuration_data() - if get_option('enable-demo-agent') + if get_option('demo-agent') conf.set('demo_agent', 'geoclue-demo-agent;') else conf.set('demo_agent', '') diff --git a/demo/meson.build b/demo/meson.build index 47d4544..349d252 100644 --- a/demo/meson.build +++ b/demo/meson.build @@ -5,7 +5,7 @@ i18n = import('i18n') desktop_conf = configuration_data() desktop_conf.set('libexecdir', get_option('libexecdir')) -if get_option('enable-libgeoclue') +if get_option('libgeoclue') include_dirs = [ configinc, libgeoclue_public_api_inc, include_directories('../libgeoclue') ] @@ -30,7 +30,7 @@ if get_option('enable-libgeoclue') install_dir: desktop_dir) endif -if get_option('enable-demo-agent') +if get_option('demo-agent') include_dirs = [ configinc, libgeoclue_public_api_inc, libgeoclue_agent_inc ] diff --git a/libgeoclue/meson.build b/libgeoclue/meson.build index 9e9fe82..84e13a7 100644 --- a/libgeoclue/meson.build +++ b/libgeoclue/meson.build @@ -56,7 +56,7 @@ libgeoclue = library('geoclue-2', gir = find_program('g-ir-scanner', required: false) vapigen = find_program('vapigen', required: false) cross_build = meson.is_cross_build() -enable_gir = get_option('enable-introspection') +enable_gir = get_option('introspection') pkg_requirements = ['glib-2.0', 'gio-2.0', 'gio-unix-2.0'] gir_sources = [ libgeoclue_sources, libgeoclue_headers, diff --git a/meson.build b/meson.build index cfacd51..d52157e 100644 --- a/meson.build +++ b/meson.build @@ -43,13 +43,13 @@ subdir('public-api') if get_option('enable-backend') subdir('src') endif -if get_option('enable-libgeoclue') +if get_option('libgeoclue') subdir('libgeoclue') endif subdir('data') subdir('demo') subdir('po') -if get_option('enable-gtk-doc') +if get_option('gtk-doc') subdir('docs') endif diff --git a/meson_options.txt b/meson_options.txt index 6c575f2..2a75136 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,31 +1,31 @@ -option('enable-libgeoclue', +option('libgeoclue', type: 'boolean', value: true, description: 'Enable convenience library') -option('enable-introspection', +option('introspection', type: 'boolean', value: true, description: 'Enable convenience library introspection generation') -option('enable-gtk-doc', +option('gtk-doc', type: 'boolean', value: true, description: 'Whether to generate the API reference for Geocode-GLib') -option('enable-3g-source', +option('3g-source', type: 'boolean', value: true, description: 'Enable 3G source (requires ModemManager') -option('enable-cdma-source', +option('cdma-source', type: 'boolean', value: true, description: 'Enable CDMA source (requires ModemManager') -option('enable-modem-gps-source', +option('modem-gps-source', type: 'boolean', value: true, description: 'Enable modem GPS source (requires ModemManager') -option('enable-nmea-source', +option('nmea-source', type: 'boolean', value: true, description: 'Enable network NMEA source (requires Avahi libraries)') option('enable-backend', type: 'boolean', value: true, description: 'Enable backend (the geoclue service)') -option('enable-demo-agent', +option('demo-agent', type: 'boolean', value: true, description: 'Build demo agent') -option('enable-debug', +option('debug', type: 'boolean', value: false, description: 'Build debug build') option('dbus-sys-dir', diff --git a/src/meson.build b/src/meson.build index 39b6472..ef4cdf3 100644 --- a/src/meson.build +++ b/src/meson.build @@ -87,9 +87,9 @@ sources += [ 'gclue-main.c', 'gclue-min-uint.h', 'gclue-min-uint.c', 'gclue-location.h', 'gclue-location.c' ] -if get_option('enable-3g-source') or - get_option('enable-cdma-source') or - get_option('enable-modem-gps-source') +if get_option('3g-source') or + get_option('cdma-source') or + get_option('modem-gps-source') geoclue_deps += [ dependency('mm-glib', version: '>= 1.6') ] sources += [ 'gclue-modem.c', 'gclue-modem.h', @@ -97,19 +97,19 @@ if get_option('enable-3g-source') or 'gclue-modem-manager.h' ] endif -if get_option('enable-3g-source') +if get_option('3g-source') sources += [ 'gclue-3g.c', 'gclue-3g.h' ] endif -if get_option('enable-cdma-source') +if get_option('cdma-source') sources += [ 'gclue-cdma.c', 'gclue-cdma.h' ] endif -if get_option('enable-modem-gps-source') +if get_option('modem-gps-source') sources += [ 'gclue-modem-gps.c', 'gclue-modem-gps.h' ] endif -if get_option('enable-nmea-source') +if get_option('nmea-source') geoclue_deps += [ dependency('avahi-client', version: '>= 0.6.10'), dependency('avahi-glib', version: '>= 0.6.10') ] sources += [ 'gclue-nmea-source.h', 'gclue-nmea-source.c' ] |