diff options
| author | Simon Ser <simon.ser@intel.com> | 2019-07-05 16:42:23 +0300 |
|---|---|---|
| committer | Simon Ser <simon.ser@intel.com> | 2019-07-16 11:58:34 +0300 |
| commit | 0ea68a1efbfcc4961f2f816ab59e4ad8136c6250 (patch) | |
| tree | a8b7d4d42f8e03ac978e6148a30e13c78db9bc41 /.gitlab-ci.yml | |
| parent | b9cac102542f2fbbbed9e5aa2b1ac04ec3795bc6 (diff) | |
build: rename Meson options
Meson emits a warning because we use options beginning with "build_":
DEPRECATION: Option uses prefix "build_", which is reserved for Meson. This will become an error in the future.
Rename our options so that we don't use the Meson-reserved prefix.
Signed-off-by: Simon Ser <simon.ser@intel.com>
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 665fbb79..7ed538a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,14 +1,14 @@ image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-fedora:latest variables: MESON_OPTIONS: > - -Dwith_libdrm=intel,nouveau,amdgpu - -Dbuild_overlay=enabled - -Dbuild_chamelium=enabled - -Dwith_valgrind=enabled - -Dbuild_man=enabled - -Dbuild_tests=enabled - -Dbuild_runner=enabled - -Dwith_libunwind=enabled + -Dlibdrm_drivers=intel,nouveau,amdgpu + -Doverlay=enabled + -Dchamelium=enabled + -Dvalgrind=enabled + -Dman=enabled + -Dtests=enabled + -Drunner=enabled + -Dlibunwind=enabled LANG: "C.UTF-8" stages: @@ -33,7 +33,7 @@ build:tests-fedora-no-libunwind: stage: build script: - dnf remove -y libunwind-devel - - meson -Dlibunwind=false build + - meson -Dlibunwind=disabled build - ninja -C build # documentation building is different with meson<0.47 @@ -72,7 +72,7 @@ build:tests-debian-minimal: image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-minimal:latest stage: build script: - - meson -Dbuild_tests=disabled -Dwith_libdrm="" build + - meson -Dtests=disabled -Dlibdrm_drivers="" build - ninja -C build artifacts: paths: |