diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-05-01 14:40:32 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-05-01 19:05:38 +0000 |
| commit | 5668522413c831d6f1c607e1c87a0b1e1ee3cbc5 (patch) | |
| tree | acf384cd68a0eafe2cc5da09c89fe23f87c6ddfa | |
| parent | fda57947b4cbb36403c0245ed503a88b4d96cddf (diff) | |
Make freetype a required package
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>
| -rw-r--r-- | src/gui/configure.cmake | 2 | ||||
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 354be5bd44..b11e06bdb4 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -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) diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 58ab106555..fe853bb910 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -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, |