[gtk/msvc-cmake-dep: 1/3] meson.build: Consolidate items with MSVC-like compilers




commit 83b98738b678056d420e69c2ae894f5d08219a0e
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Feb 21 17:41:00 2022 +0800

    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.

 meson.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
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',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]