From 6409f2f41df9d762974bfe6195e450114aa6ea64 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 9 Jun 2022 16:35:44 +0200 Subject: [PATCH] CMake: Fix check for system harfbuzz if pkg-config is unavailable We need to check whether pkg_check_modules returns success before setting up target name etc. Fixes: QTBUG-103894 Change-Id: I12702639683723d976e93be95443099b88885869 Reviewed-by: Alexandru Croitor (cherry picked from commit 71a0b893fb4beb15df4a6bfe540518e5267fdb40) Reviewed-by: Qt Cherry-pick Bot --- cmake/FindWrapSystemHarfbuzz.cmake | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake index 3cb44aa766d..170b6f3b225 100644 --- a/cmake/FindWrapSystemHarfbuzz.cmake +++ b/cmake/FindWrapSystemHarfbuzz.cmake @@ -32,18 +32,19 @@ if(__harfbuzz_broken_config_file OR NOT __harfbuzz_found) find_package(PkgConfig QUIET) pkg_check_modules(PC_HARFBUZZ harfbuzz IMPORTED_TARGET) + if(PC_HARFBUZZ_FOUND) + find_path(HARFBUZZ_INCLUDE_DIRS + NAMES harfbuzz/hb.h + HINTS ${PC_HARFBUZZ_INCLUDEDIR}) + find_library(HARFBUZZ_LIBRARIES + NAMES harfbuzz + HINTS ${PC_HARFBUZZ_LIBDIR}) - find_path(HARFBUZZ_INCLUDE_DIRS - NAMES harfbuzz/hb.h - HINTS ${PC_HARFBUZZ_INCLUDEDIR}) - find_library(HARFBUZZ_LIBRARIES - NAMES harfbuzz - HINTS ${PC_HARFBUZZ_LIBDIR}) - - set(__harfbuzz_target_name "PkgConfig::PC_HARFBUZZ") - set(__harfbuzz_found TRUE) - if(PC_HARFBUZZ_VERSION) - set(WrapSystemHarfbuzz_VERSION "${PC_HARFBUZZ_VERSION}") + set(__harfbuzz_target_name "PkgConfig::PC_HARFBUZZ") + set(__harfbuzz_found TRUE) + if(PC_HARFBUZZ_VERSION) + set(WrapSystemHarfbuzz_VERSION "${PC_HARFBUZZ_VERSION}") + endif() endif() endif()