AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make freetype a required package

Browse Source 
With qmake if we don't find a system package, we use the bundled one.
With CMake we don't provide a bundle freetype, hence it's required
to find a system one (or custom provided one).

Change-Id: I00a5e2ac55459957dae0729f89bafa792a102152
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Alexandru Croitor 2019-05-01 14:40:32 +02:00
parent fda57947b4
commit 5668522413
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/configure.cmake
View File

@ -29,7 +29,7 @@ set_package_properties(Libdrm PROPERTIES TYPE OPTIONAL)
find_package(EGL)
set_package_properties(EGL PROPERTIES TYPE OPTIONAL)
find_package(Freetype)
set_package_properties(Freetype PROPERTIES TYPE OPTIONAL)
set_package_properties(Freetype PROPERTIES TYPE REQUIRED)
find_package(Fontconfig)
set_package_properties(Fontconfig PROPERTIES TYPE OPTIONAL)
find_package(gbm)

2
util/cmake/configurejson2cmake.py
View File

@ -54,7 +54,7 @@ def map_library(lib: str) -> Union[str, LibraryMapping, List[str]]:
'drm': 'Libdrm',
'egl': 'EGL',
'fontconfig': LibraryMapping(package='Fontconfig', resultVariable="FONTCONFIG"),
'freetype': 'Freetype',
'freetype': ['Freetype', 'REQUIRED'],
'gbm': 'gbm',
'glib': 'GLIB2',
'gnu_iconv': None,