[gtk+] build: Add fallback dependency discovery for MSVC
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] build: Add fallback dependency discovery for MSVC
- Date: Fri, 15 Sep 2017 13:41:55 +0000 (UTC)
commit 84ff9e93d54b0fbee4f92d42bff679db7d06afc8
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Sep 12 13:34:36 2017 +0800
build: Add fallback dependency discovery for MSVC
For dependencies that do not generate pkg-config files for their Visual
Studio build systems, we need to look for them using cc.has_header() and
cc.find_library(), namely for Cairo and HarfBuzz, if one does not have
crafted pkg-config files for them (which, by themselves may be
error-prone).
As a result, we will still try to look for Cairo and HarfBuzz using
pkg-config, but will give another shot at them on Visual Studio using
cc.has_header() and cc.find_library() if they couldn't be found via
pkg-config.
https://bugzilla.gnome.org/show_bug.cgi?id=785210
meson.build | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 60 insertions(+), 9 deletions(-)
---
diff --git a/meson.build b/meson.build
index 8e90f9e..5051ec6 100644
--- a/meson.build
+++ b/meson.build
@@ -323,8 +323,8 @@ giounix_dep = dependency('gio-unix-2.0', version: glib_req, required: false,
fallback : ['glib', 'libgio_dep'])
gmodule_dep = dependency('gmodule-2.0', version: glib_req,
fallback : ['glib', 'libgmodule_dep'])
-cairo_dep = dependency('cairo', version: cairo_req)
-cairogobj_dep = dependency('cairo-gobject', version: cairo_req)
+cairo_dep = dependency('cairo', version: cairo_req, required : cc.get_id() != 'msvc')
+cairogobj_dep = dependency('cairo-gobject', version: cairo_req, required : cc.get_id() != 'msvc')
pango_dep = dependency('pango', version: pango_req,
fallback : ['pango', 'libpango_dep'])
pangoft_dep = dependency('pangoft2', required: wayland_enabled or x11_enabled,
@@ -357,11 +357,54 @@ foreach backend: [ ['cairo-xlib', cairo_req, x11_enabled],
cairo_backend_req = backend.get(1)
cairo_backend = backend.get(0)
if backend_enabled
- dependency(cairo_backend, version: cairo_backend_req)
- cairo_backends += [ cairo_backend ]
+ if dependency(cairo_backend, version: cairo_backend_req, required : cc.get_id() != 'msvc').found()
+ cairo_backends += [ cairo_backend ]
+ endif
endif
endforeach
+cairo_pkg_found = false
+cairogobj_pkg_found = false
+
+if cairo_dep.found()
+ cairo_pkg_found = true
+endif
+if cairogobj_dep.found()
+ cairogobj_pkg_found = true
+endif
+
+if cc.get_id() == 'msvc'
+ # Fallback depedency discovery for those on Visual Studio that do not generate
+ # pkg-config files in their build systems for MSVC
+ # Fallback for Cairo
+ cairo_libs = []
+ if not cairo_dep.found()
+ if (cc.has_header('cairo.h') and cc.has_header('cairo-win32.h'))
+ cairo_dep = cc.find_library('cairo')
+ if cairo_dep.found()
+ cairo_libs += '-lcairo'
+ endif
+ endif
+ endif
+
+ # Fallback for Cairo-GObject
+ if not cairogobj_dep.found()
+ if cc.has_header('cairo-gobject.h')
+ cairogobj_dep = cc.find_library('cairo-gobject')
+ if cairogobj_dep.found()
+ cairo_libs += '-lcairo-gobject'
+ endif
+ endif
+ endif
+
+ # Fallback for HarfBuzz
+ if not harfbuzz_dep.found()
+ if cc.has_header('harfbuzz/hb.h')
+ harfbuzz_dep = cc.find_library('harfbuzz', required : false)
+ endif
+ endif
+endif
+
atk_pkgs = ['atk']
wayland_pkgs = []
@@ -570,12 +613,18 @@ pkgconf.set('host', '@0@-@1@'.format(host_machine.cpu_family(), host_machine.sys
# Requires
pango_pkgname = win32_enabled ? 'pangowin32' : 'pango'
-pkgconf.set('GDK_PACKAGES',
- ' '.join([ pango_pkgname, pango_req,
+gdk_packages = ' '.join([ pango_pkgname, pango_req,
'pangocairo', pango_req,
- 'gdk-pixbuf-2.0', gdk_pixbuf_req,
- 'cairo', cairo_req,
- 'cairo-gobject', cairo_req ]))
+ 'gdk-pixbuf-2.0', gdk_pixbuf_req ])
+
+if cairo_pkg_found
+ gdk_packages += ' '.join([ ' cairo', cairo_req ])
+endif
+if cairogobj_pkg_found
+ gdk_packages += ' '.join([ ' cairo-gobject', cairo_req ])
+endif
+
+pkgconf.set('GDK_PACKAGES', gdk_packages)
pkgconf.set('GSK_PACKAGES',
' '.join([ 'graphene-gobject-1.0', graphene_req ]))
pkgconf.set('GTK_PACKAGES',
@@ -583,6 +632,8 @@ pkgconf.set('GTK_PACKAGES',
'gio-2.0', glib_req ]))
# Requires.private
+pc_gdk_extra_libs += cairo_libs
+
gio_pkgname = os_unix ? 'gio-unix-2.0' : 'gio-2.0'
pkgconf.set('GDK_PRIVATE_PACKAGES',
' '.join([ gio_pkgname, glib_req,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]