diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-06-09 16:35:44 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-06-10 14:25:41 +0200 |
| commit | 71a0b893fb4beb15df4a6bfe540518e5267fdb40 (patch) | |
| tree | 3ea124ef14185eeb65c7d2a9c1eb0c1831117b1e | |
| parent | 4cef4f1c1be713e932052968ac853ec37750ae61 (diff) | |
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.
Pick-to: 6.2 6.3 6.4
Fixes: QTBUG-103894
Change-Id: I12702639683723d976e93be95443099b88885869
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | cmake/FindWrapSystemHarfbuzz.cmake | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake index 3cb44aa766..170b6f3b22 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) - - 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}") + 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}) + + set(__harfbuzz_target_name "PkgConfig::PC_HARFBUZZ") + set(__harfbuzz_found TRUE) + if(PC_HARFBUZZ_VERSION) + set(WrapSystemHarfbuzz_VERSION "${PC_HARFBUZZ_VERSION}") + endif() endif() endif() |