meson: Rename the configuration options

The `enable-` prefix is an Autotool-ism; idiomatic naming for Meson
projects should just use the name of the option, and rely on the type
to convey meaning, especially because Meson does not have `disable`
aliases that avoid the explicit `enable-foo=no` cases.
macos/v1.5.9
Emmanuele Bassi 7 years ago
parent c794dce0a0
commit a7c3178f86
  1. 5
      .travis.yml
  2. 6
      meson.build
  3. 6
      meson_options.txt

@ -28,5 +28,6 @@ before_script:
script: script:
- docker run withgit /bin/sh -c "CC=$CC ./epoxy-run-tests.sh" - docker run withgit /bin/sh -c "CC=$CC ./epoxy-run-tests.sh"
- docker run withgit /bin/sh -c "CC=$CC ./epoxy-run-tests.sh -Denable-glx=no" - docker run withgit /bin/sh -c "CC=$CC ./epoxy-run-tests.sh -Dglx=no"
- docker run withgit /bin/sh -c "CC=$CC ./epoxy-run-tests.sh -Denable-egl=no" - docker run withgit /bin/sh -c "CC=$CC ./epoxy-run-tests.sh -Degl=no"
- docker run withgit /bin/sh -c "CC=$CC ./epoxy-run-tests.sh -Dx11=false"

@ -34,7 +34,7 @@ conf.set('HAVE_KHRPLATFORM_H', cc.has_header('KHR/khrplatform.h', required: fals
# configure time switch to enable or disable it; in case # configure time switch to enable or disable it; in case
# the "auto" default value is set, we only enable GLX # the "auto" default value is set, we only enable GLX
# support on Linux and Unix # support on Linux and Unix
enable_glx = get_option('enable-glx') enable_glx = get_option('glx')
if enable_glx == 'auto' if enable_glx == 'auto'
if host_system == 'windows' if host_system == 'windows'
build_glx = false build_glx = false
@ -53,7 +53,7 @@ elif enable_glx == 'no'
build_glx = false build_glx = false
endif endif
enable_egl = get_option('enable-egl') enable_egl = get_option('egl')
if enable_egl == 'auto' if enable_egl == 'auto'
if host_system == 'windows' if host_system == 'windows'
build_egl = false build_egl = false
@ -249,7 +249,7 @@ subdir('include/epoxy')
subdir('src') subdir('src')
subdir('test') subdir('test')
if get_option('enable-docs') if get_option('docs')
doxygen = find_program('doxygen', required: false) doxygen = find_program('doxygen', required: false)
if doxygen.found() if doxygen.found()
subdir('doc') subdir('doc')

@ -1,12 +1,12 @@
option('enable-docs', option('docs',
type: 'boolean', value: false, type: 'boolean', value: false,
description: 'Enable generating the Epoxy API reference (depends on Doxygen)') description: 'Enable generating the Epoxy API reference (depends on Doxygen)')
option('enable-glx', option('glx',
type: 'combo', type: 'combo',
choices: [ 'auto', 'yes', 'no' ], choices: [ 'auto', 'yes', 'no' ],
value: 'auto', value: 'auto',
description: 'Enable GLX support') description: 'Enable GLX support')
option('enable-egl', option('egl',
type: 'combo', type: 'combo',
choices: [ 'auto', 'yes', 'no' ], choices: [ 'auto', 'yes', 'no' ],
value: 'auto', value: 'auto',

Loading…
Cancel
Save