diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-05-05 09:52:48 -0400 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2021-05-05 09:52:48 -0400 |
| commit | 7305f1ee096f819b52118b179c06e3d868518689 (patch) | |
| tree | b92948f70dadceb69e3963b2bf708a7ee8b24609 /.gitlab | |
| parent | 1bfbff2a7f36c92c156897db79109121f465bb7d (diff) | |
| download | gdk-pixbuf-7305f1ee096f819b52118b179c06e3d868518689.tar.gz | |
Meson: Change png/jpeg/tiff options from boolean to feature
png/jpeg are essential and have a fallback subproject so they are
enabled by default. tiff is not required by GTK and does not have a
subproject so it's set to 'auto' by default.
This fixes the case where tiff option was set to true by default but
meson setup was not aborting if the dependency was not found. Instead it
was failing at build time.
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/test-msys2.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab/ci/test-msys2.sh b/.gitlab/ci/test-msys2.sh index b5a94c946..f9ac9e639 100644 --- a/.gitlab/ci/test-msys2.sh +++ b/.gitlab/ci/test-msys2.sh @@ -21,9 +21,9 @@ pacman --noconfirm -S --needed \ mingw-w64-$MSYS2_ARCH-toolchain meson setup --buildtype debug \ - -Dpng=true \ - -Djpeg=true \ - -Dtiff=true \ + -Dpng=enabled \ + -Djpeg=enabled \ + -Dtiff=enabled \ _build meson compile -C _build |