diff options
| author | Tamas Kenez <tamas.kenez@adasworks.com> | 2015-11-27 07:04:31 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2015-11-27 07:04:31 +0100 |
| commit | 4854df62f72fe70d0517eecbd1cd6e7a6e508e67 (patch) | |
| tree | c7f4950fb3241ce9de7301e6d73ed92edd68866a /builds/cmake | |
| parent | 5b3446b01218df2334f391fd3b8caa18553895f8 (diff) | |
| download | freetype2-4854df62f72fe70d0517eecbd1cd6e7a6e508e67.tar.gz | |
[cmake] Make `FindHarfbuzz' observe the REQUIRED option.
* builds/cmake/FindHarfBuzz.cmake: Implement it.
Diffstat (limited to 'builds/cmake')
| -rw-r--r-- | builds/cmake/FindHarfBuzz.cmake | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/builds/cmake/FindHarfBuzz.cmake b/builds/cmake/FindHarfBuzz.cmake index 8440c7b2b..f394b82bf 100644 --- a/builds/cmake/FindHarfBuzz.cmake +++ b/builds/cmake/FindHarfBuzz.cmake @@ -44,15 +44,26 @@ find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz # HarfBuzz 0.9.18 split ICU support into a separate harfbuzz-icu library. if ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "0.9.17") - pkg_check_modules(PC_HARFBUZZ_ICU harfbuzz-icu>=0.9.18 REQUIRED) + if (HarfBuzz_FIND_REQUIRED) + set(_HARFBUZZ_REQUIRED REQUIRED) + else () + set(_HARFBUZZ_REQUIRED "") + endif () + pkg_check_modules(PC_HARFBUZZ_ICU harfbuzz-icu>=0.9.18 ${_HARFBUZZ_REQUIRED}) find_library(HARFBUZZ_ICU_LIBRARIES NAMES harfbuzz-icu HINTS ${PC_HARFBUZZ_ICU_LIBRARY_DIRS} ${PC_HARFBUZZ_ICU_LIBDIR} ) - list(APPEND HARFBUZZ_LIBRARIES "${HARFBUZZ_ICU_LIBRARIES}") + if (HARFBUZZ_ICU_LIBRARIES) + list(APPEND HARFBUZZ_LIBRARIES "${HARFBUZZ_ICU_LIBRARIES}") + endif () + set(_HARFBUZZ_EXTRA_REQUIRED_VAR "HARFBUZZ_ICU_LIBRARIES") +else () + set(_HARFBUZZ_EXTRA_REQUIRED_VAR "") endif () include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIRS HARFBUZZ_LIBRARIES) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIRS + HARFBUZZ_LIBRARIES ${_HARFBUZZ_EXTRA_REQUIRED_VAR}) mark_as_advanced( HARFBUZZ_ICU_LIBRARIES |