From cc5360ab4c29e4a4c22689c27a319e6c0fbe4981 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 19 Nov 2020 16:53:53 +0800 Subject: meson.build: Improve FreeType search Make the current method to look for a 'freetype2' package exclusive to using pkg-config, and try also looking for FreeType using CMake by looking for a 'freetype' package, since that is what the CMake module is named. --- meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 48e72686..cbf6b242 100644 --- a/meson.build +++ b/meson.build @@ -330,7 +330,10 @@ if not freetype_option.disabled() or freetype_required endif # The first version of freetype with a pkg-config file is 2.1.5 -freetype_dep = dependency('freetype2', required: freetype_option) +freetype_dep = dependency('freetype2', required: freetype_option, method: 'pkg-config') +if not freetype_dep.found() + freetype_dep = dependency('freetype', required: freetype_option, method: 'cmake') +endif if freetype_dep.found() freetype2_pc = 'freetype2' -- cgit v1.2.1