From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon, 21 Feb 2022 09:50:15 +0000 (+0800)
Subject: meson.build: Use CMake to find libjpeg on MSVC-like builds
X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~19^2~3^2~87^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2e34d6211171c1ceabec33c01e0fc1982ee00cf1;p=gtk4.git

meson.build: Use CMake to find libjpeg on MSVC-like builds

One may be using IJG libjpeg or libjpeg-turbo to build GTK, and their
build files may or may not generate pkg-config files for us.  To make
things easier, we can make use of CMake's built-in support for finding
IJG libjpeg or libjpeg-turbo.
---

diff --git a/meson.build b/meson.build
index 4a1e41d4a5..1be01835e4 100644
--- a/meson.build
+++ b/meson.build
@@ -422,7 +422,7 @@ png_dep        = dependency(is_msvc_like ? 'png' : 'libpng',
 tiff_dep       = dependency(is_msvc_like ? 'tiff' : 'libtiff-4',
                             fallback: ['libtiff', 'libtiff4_dep'],
                             required: true)
-jpeg_dep       = dependency('libjpeg',
+jpeg_dep       = dependency(is_msvc_like ? 'jpeg' : 'libjpeg',
                             fallback: ['libjpeg-turbo', 'jpeg_dep'],
                             required: true)