meson.build: Consolidate items with MSVC-like compilers
authorChun-wei Fan <fanchunwei@src.gnome.org>
Mon, 21 Feb 2022 09:41:00 +0000 (17:41 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Mon, 21 Feb 2022 09:53:31 +0000 (17:53 +0800)
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.

meson.build

index 5add133d460dc99168da520c63d1b5a5f0325a3b..b76d1d65c5ebbf83a90f4a4eab8ea86e646cc737 100644 (file)
@@ -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',