From ac250b0f86f9364d8610c214f8ee7ae09e4ebd35 Mon Sep 17 00:00:00 2001 From: Tamas Kenez Date: Mon, 23 Nov 2015 01:48:36 +0100 Subject: [PATCH] [cmake] make FindHarfbuzz observe the REQUIRED option --- builds/FindHarfBuzz.cmake | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/builds/FindHarfBuzz.cmake b/builds/FindHarfBuzz.cmake index 8440c7b..55d9264 100644 --- a/builds/FindHarfBuzz.cmake +++ b/builds/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 -- 2.6.2