summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-04-19 11:49:31 -0400
committerMatthias Clasen <mclasen@redhat.com>2021-04-19 11:49:31 -0400
commitf6a3f6d8add98bf5f15d6fbdc4cd887a0936b531 (patch)
tree87a54ec216c7f0a84182e28a4a9252fae1f6daa4
parentc287fb3a1f3e9a19abf062ac773f4c6a5118100b (diff)
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.
-rw-r--r--meson.build9
1 files changed, 8 insertions, 1 deletions
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'],
)