Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'msvc-cmake-dep' into 'main'

Browse Source 
Meson: Use CMake more for finding deps on Visual Studio-like builds

See merge request GNOME/gtk!4499
This commit is contained in:
Emmanuele Bassi
2022-02-21 13:37:12 +00:00
parent 7d6797c9ed 2e34d62111
commit f41fe7b8e4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@@ -409,18 +409,20 @@ 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',
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)