Commit e50fbc1b authored by Chun-wei Fan's avatar Chun-wei Fan
Browse files

meson: Look for FreeType using CMake too

Some systems build FreeType using CMake rather than autotools (such as Visual
Studio), which will give us CMake config files rather than pkg-config files, so
if we can't find FreeType using pkg-config, try again using CMake.

Please note that according to FreeType's docs/VERSIONS.TXT, the version we want
when checking with CMake is 2.8.1 or later.
parent 74f05951
Pipeline #208727 passed with stage
in 7 minutes and 22 seconds
......@@ -20,14 +20,22 @@ defversion = '@0@.@1@'.format(curversion, fc_version_micro)
osxversion = curversion + 1
freetype_req = '>= 21.0.15'
freetype_req_cmake = '>= 2.8.1'
freetype_dep = dependency('freetype2', version: freetype_req,
cc = meson.get_compiler('c')
freetype_dep = dependency('freetype2', method: 'pkg-config', version: freetype_req, required: false)
# Give another shot using CMake
if not freetype_dep.found()
freetype_dep = dependency('freetype', method: 'cmake', version: freetype_req_cmake,
fallback: ['freetype2', 'freetype_dep'])
endif
expat_dep = dependency('expat',
fallback: ['expat', 'expat_dep'])
cc = meson.get_compiler('c')
i18n = import('i18n')
pkgmod = import('pkgconfig')
python3 = import('python').find_installation()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment