diff options
| author | Niels De Graef <nielsdegraef@gmail.com> | 2018-04-01 12:56:18 +0200 |
|---|---|---|
| committer | Niels De Graef <nielsdegraef@gmail.com> | 2018-04-01 12:58:05 +0200 |
| commit | f429a775d8de3782ad770b6f8c0668b22016d559 (patch) | |
| tree | 635c3070eb7f4938206aa83c781f106feb289b62 | |
| parent | b7201bad70db5fac262ccda4b4df74ad7fa27374 (diff) | |
| download | gnome-contacts-f429a775d8de3782ad770b6f8c0668b22016d559.tar.gz | |
Meson: drop "with-" prefix for configurable options.
This is against the GNOME Meson guidelines.
Fixes #91.
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | meson_options.txt | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b99213f..1cc30ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,6 @@ before_script: build-gnome-contacts: stage: build script: - - meson -Dwith-manpage=false _build . + - meson -Dmanpage=false _build . - ninja -v -C _build - ninja -v -C _build install diff --git a/meson.build b/meson.build index 4ad46c5..ca560f9 100644 --- a/meson.build +++ b/meson.build @@ -14,10 +14,10 @@ add_project_arguments( ) # Options -cheese_enabled = get_option('with-cheese') +cheese_enabled = get_option('cheese') telepathy_enabled = get_option('telepathy') docs_enabled = get_option('docs') -manpage_enabled = get_option('with-manpage') +manpage_enabled = get_option('manpage') # Common variables config_h_dir = include_directories('.') diff --git a/meson_options.txt b/meson_options.txt index 40d2c52..bd993df 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,4 @@ -option('with-cheese', type: 'boolean', value: true, description: 'Enable cheese webcam support.') +option('cheese', type: 'boolean', value: true, description: 'Enable cheese webcam support.') option('telepathy', type: 'boolean', value: true, description: 'Enable Telepathy call/chat support.') -option('with-manpage', type: 'boolean', value: true, description: 'enable building man pages') +option('manpage', type: 'boolean', value: true, description: 'Enable building man pages.') option('docs', type: 'boolean', value: false, description: 'Whether to build the valadoc docs.') |