diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2022-02-21 13:37:12 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2022-02-21 13:37:12 +0000 |
| commit | f41fe7b8e493d3580d8b40a73b079315bc76235e (patch) | |
| tree | 90b9b9aae3cfc8ee7e7b81843f570aa69a45af1f | |
| parent | 7d6797c9ed56d25f0b365d5b55831c9432e599ac (diff) | |
| parent | 2e34d6211171c1ceabec33c01e0fc1982ee00cf1 (diff) | |
| download | gtk+-f41fe7b8e493d3580d8b40a73b079315bc76235e.tar.gz | |
Merge branch 'msvc-cmake-dep' into 'main'
Meson: Use CMake more for finding deps on Visual Studio-like builds
See merge request GNOME/gtk!4499
| -rw-r--r-- | meson.build | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 5add133d46..1be01835e4 100644 --- a/meson.build +++ b/meson.build @@ -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) |