meson: Simplify check for freetype2 library and headers

5 years ago · 33252ce576
parent 40ec187dec
commit 33252ce576
1 changed files with 2 additions and 3 deletions
--- a/meson.build
+++ b/meson.build
@ -72,9 +72,8 @@ if not get_option('freetype').disabled()
  freetype_dep = dependency('freetype2', required: false)

  if not freetype_dep.found() and cpp.get_id() == 'msvc'
-    if cpp.has_header('ft2build.h')
-      freetype_dep = cpp.find_library('freetype', required: false)
-    endif
+    freetype_dep = cpp.find_library('freetype', required: false,
+                                    has_headers: ['ft2build.h'], )
  endif

  if not freetype_dep.found() and get_option('freetype').enabled()