Commit a019f1de authored by Marco Trevisan's avatar Marco Trevisan 🎺

meson: use options name matching GNOME standards

parent 2fd99e8b
Pipeline #39519 passed with stage
in 3 minutes and 42 seconds
......@@ -48,5 +48,5 @@ build:ubuntu:meson:
python3-setuptools
- pip3 install meson
script:
- meson _build -Denable-gtk-doc=true
- meson _build -Dgtk_doc=true
- ninja -C _build
......@@ -81,7 +81,7 @@ libwnck_ldflags = [
'-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile),
]
if get_option('enable-deprecation-flags')
if get_option('deprecation_flags')
foreach domain: ['G', 'ATK', 'GDK', 'GDK_PIXBUF', 'GTK', 'WNCK']
libwnck_cflags += '-D@0@_DISABLE_DEPRECATED'.format(domain)
endforeach
......@@ -123,7 +123,7 @@ progs = [
'wnckprop',
]
if not get_option('enable-deprecation-flags')
if not get_option('deprecation_flags')
progs += 'wnck-urgency-monitor'
endif
......@@ -141,6 +141,6 @@ foreach prog: progs + test_progs
include_directories: default_includes,
dependencies: libwnck_dep,
link_with: libwnck_lib,
install: progs.contains(prog) and get_option('install-tools'),
install: progs.contains(prog) and get_option('install_tools'),
install_dir: bindir)
endforeach
......@@ -43,7 +43,7 @@ pkg_deps = [
{'name': 'glib-2.0', 'version': '>= 2.32' },
{'name': 'gobject-2.0', 'version': '>= 2.13.0' },
{'name': 'gtk+-3.0', 'version': '>= 3.22.0' },
{'name': STARTUP_NOTIFICATION_PACKAGE, 'version': '>= 0.4', 'required': get_option('startup-notification').enabled() },
{'name': STARTUP_NOTIFICATION_PACKAGE, 'version': '>= 0.4', 'required': get_option('startup_notification').enabled() },
{'name': X11_PACKAGE },
{'name': XRES_PACKAGE, 'required': false},
]
......@@ -93,6 +93,6 @@ endforeach
subdir('libwnck')
subdir('po')
if get_option('enable-gtk-doc')
if get_option('gtk_doc')
subdir('doc')
endif
option('enable-deprecation-flags',
option('deprecation_flags',
type: 'boolean',
value: false,
description: 'Use *_DISABLE_DEPRECATED flags')
option('install-tools',
option('install_tools',
type: 'boolean',
value: true,
description: 'Install wnck-based tools')
option('startup-notification',
option('startup_notification',
type: 'feature',
value: 'auto',
description: 'Use Startup notification')
......@@ -14,7 +14,7 @@ option('introspection',
type: 'feature',
value: 'enabled',
description: 'Enable GObject introspection')
option('enable-gtk-doc',
option('gtk_doc',
type: 'boolean',
value: false,
description: 'Enable generating the API reference (depends on GTK-Doc)')
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment