[gtk/master-msvc-fixes: 12/12] meson: Improve search for libpng
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/master-msvc-fixes: 12/12] meson: Improve search for libpng
- Date: Thu, 30 Sep 2021 08:22:39 +0000 (UTC)
commit dbd0ce30d9ec4ad0baf958087bd3ff31e1f33957
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Sep 30 16:17:48 2021 +0800
meson: Improve search for libpng
On Visual Studio-style builds, it is likely that we do not have pkg-config
files for libpng, so improve the search for libpng by using CMake's built-in
mechanisms for looking for libpng. This, however, means that we need to use
'png' rather than 'libpng' for the package name to search for.
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index e85daf88f5..dd6e9d6471 100644
--- a/meson.build
+++ b/meson.build
@@ -400,7 +400,7 @@ pangocairo_dep = dependency('pangocairo', version: pango_req,
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('libpng',
+png_dep = dependency(cc.get_argument_syntax() == 'msvc' ? '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]