[cairo-commit] 2 commits - meson.build

[GitLab Mirror]

 meson.build |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit d4617e31bef2136309c208c1faed895a013deb0a
Merge: 7de7d5759 f6a3f6d8a
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Tue Apr 20 10:33:20 2021 +0000

    Merge branch 'no-fontconfig-on-windows' into 'master'
    
    Don't build fontconfig on Windows
    
    See merge request cairo/cairo!159

commit f6a3f6d8add98bf5f15d6fbdc4cd887a0936b531
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Mon Apr 19 11:49:31 2021 -0400

    Don't build fontconfig on Windows
    
    mesons 'auto' is too eager to build things. Building
    fontconfig as a subproject on Windows is not the right
    thing, unless it was explictly requested.

diff --git a/meson.build b/meson.build
index 0a0e2cf27..1e14b3286 100644
--- a/meson.build
+++ b/meson.build
@@ -198,8 +198,15 @@ if png_dep.found()
   endif
 endif
 
+# Don't build fontconfig as a subproject on Windows unless
+# explicitly requested
+fontconfig_option = get_option('fontconfig')
+if host_machine.system() == 'windows' and not fontconfig_option.enabled()
+  fontconfig_option = false
+endif
+
 fontconfig_dep = dependency('fontconfig',
-  required: get_option('fontconfig'),
+  required: fontconfig_option,
   version: fontconfig_required_version,
   fallback: ['fontconfig', 'fontconfig_dep'],
 )