Skip to content

Commit

Permalink
build: Rename last 'enable' options
Browse files Browse the repository at this point in the history
Drop the 'enable-' prefix to conform to the best practices for naming
configuration options in Meson.
  • Loading branch information
ebassi committed Feb 14, 2018
1 parent 7b32900 commit 327e7a4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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()
Expand Down
6 changes: 3 additions & 3 deletions meson_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 327e7a4

Please sign in to comment.