summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2018-02-14 14:07:22 +0000
committerEmmanuele Bassi <ebassi@gnome.org>2018-02-14 14:14:22 +0000
commit327e7a4ccc8585b98a58a6526cb84448df2d0f53 (patch)
treed7c94881efbadf7b5baf660a200f650d0346ac86
parent7b32900c55745bb29b391ce334d86b502f34879d (diff)
downloadgtk+-327e7a4ccc8585b98a58a6526cb84448df2d0f53.tar.gz
build: Rename last 'enable' optionsissue-2
Drop the 'enable-' prefix to conform to the best practices for naming configuration options in Meson.
-rw-r--r--meson.build6
-rw-r--r--meson_options.txt6
2 files changed, 6 insertions, 6 deletions
diff --git a/meson.build b/meson.build
index 037b78f8fa..24ada585fa 100644
--- a/meson.build
+++ b/meson.build
@@ -507,7 +507,7 @@ if x11_enabled
endif
endif
- enable_xinerama = get_option('enable-xinerama')
+ enable_xinerama = get_option('xinerama')
if enable_xinerama != 'no'
want_xinerama = enable_xinerama == 'yes'
xinerama_dep = dependency('xinerama', required: want_xinerama)
@@ -560,7 +560,7 @@ have_vulkan = false
vulkan_pkg_found = false
vulkan_dep = []
-enable_vulkan = get_option('enable-vulkan')
+enable_vulkan = get_option('vulkan')
if enable_vulkan == 'no'
message('Vulkan support explicitly disabled')
else
@@ -585,7 +585,7 @@ else
endif
endif
-cloudproviders_enabled = get_option('enable-cloudproviders')
+cloudproviders_enabled = get_option('cloudproviders')
if cloudproviders_enabled
cloudproviders_dep = dependency('cloudproviders', required: true)
if cloudproviders_dep.found()
diff --git a/meson_options.txt b/meson_options.txt
index 07de49a45a..896347e10b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -11,11 +11,11 @@ option('quartz-backend', type: 'boolean', value: true,
description : 'Enable the macOS gdk backend (only when building on macOS)')
# Optional dependencies
-option('enable-vulkan', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
+option('vulkan', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
description : 'Enable support for the Vulkan graphics API')
-option('enable-xinerama', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
+option('xinerama', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
description : 'Enable support for the Xinerama extension')
-option('enable-cloudproviders', type: 'boolean', value: false,
+option('cloudproviders', type: 'boolean', value: false,
description : 'Enable the cloudproviders support')
# Print backends