diff options
| author | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2019-05-21 12:36:01 +0300 |
|---|---|---|
| committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2019-05-23 15:14:08 +0300 |
| commit | 736b099862f61b115b3845309b860cb66915fe2a (patch) | |
| tree | 41dd86b1a58178349c305245e53950754efda2c7 /.gitlab-ci.yml | |
| parent | 29cb27e662948b1d0710e9fdaceb5bb221746ff8 (diff) | |
meson: Start using 'feature' options
Meson 0.47 comes with a new type of option called 'feature' so instead of:
type : 'combo',
value : 'auto',
choices : ['auto', 'true', 'false'],
We can:
type : 'feature',
The main difference is that the feature takes auto, enabled and disabled
instead of auto, true and false.
get_option() on a feature returns opaque object that can be passed as
a 'required' argument of a dependency. Auto is equivalent to 'required
: false', enabled is equivalent to 'required : true' and disabled
introduces new behavior forcing the dependency to be considered not
found.
This allows us to streamline a lot of logic regarding optional IGT
features.
This patch bumps required meson version to 0.47.0
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Simon Ser <simon.ser@intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9fe6a8f6..771143a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,13 +2,13 @@ image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-fedora:latest variables: MESON_OPTIONS: > -Dwith_libdrm=intel,nouveau,amdgpu - -Dbuild_overlay=true - -Dbuild_chamelium=true - -Dwith_valgrind=true - -Dbuild_man=true - -Dbuild_tests=true - -Dbuild_runner=true - -Dwith_libunwind=true + -Dbuild_overlay=enabled + -Dbuild_chamelium=enabled + -Dwith_valgrind=enabled + -Dbuild_man=enabled + -Dbuild_tests=enabled + -Dbuild_runner=enabled + -Dwith_libunwind=enabled LANG: "C.UTF-8" stages: |