From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon, 21 Feb 2022 09:41:00 +0000 (+0800)
Subject: meson.build: Consolidate items with MSVC-like compilers
X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~19^2~3^2~87^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=83b98738b678056d420e69c2ae894f5d08219a0e;p=gtk4.git

meson.build: Consolidate items with MSVC-like compilers

Add a variable in meson.build that covers Visual Studio-like compilers,
so that we can use it to help us find depedencies using CMake rather
than via pkg-config, where applicable.

Change the existing use case for finding libpng accordingly.
---

diff --git a/meson.build b/meson.build
index 5add133d46..b76d1d65c5 100644
--- a/meson.build
+++ b/meson.build
@@ -409,12 +409,14 @@ if win32_enabled
   pangowin32_dep = dependency('pangowin32')
 endif
 
+is_msvc_like = cc.get_argument_syntax() == 'msvc'
+
 pangocairo_dep = dependency('pangocairo', version: pango_req,
                             fallback : ['pango', 'libpangocairo_dep'])
 pixbuf_dep     = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req,
                             fallback : ['gdk-pixbuf', 'gdkpixbuf_dep'],
                             default_options: ['png=enabled', 'jpeg=enabled', 'builtin_loaders=png,jpeg', 'man=false'])
-png_dep        = dependency(cc.get_argument_syntax() == 'msvc' ? 'png' : 'libpng',
+png_dep        = dependency(is_msvc_like ? 'png' : 'libpng',
                             fallback: ['libpng', 'libpng_dep'],
                             required: true)
 tiff_dep       = dependency('libtiff-4',