diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-10-23 08:00:56 +0000 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-10-23 19:41:20 +0000 |
| commit | d7d144b530150c2730bab3c0835b490fe53e57f8 (patch) | |
| tree | 91eb7bcf200620fec66c88805a18d6e2240fdebc /cmake/FindWrapSystemHarfbuzz.cmake | |
| parent | 92194ac571cb70c796101d1daa2e4bed214a439b (diff) | |
Revert "Make sure that pkgconf can find HarfBuzz"
This reverts commit 885d87488ade83b37519a3b08cd968dc76a661c2.
Reason for revert: Issue was caused by a faulty `.pc` file which was reported to upstream, in addition, the patch might not be effective in certain cases as tested by the reporter. See the bug report for further information.
Change-Id: I2b75a79f47b77a660bd23cd41df40df9ea4baef2
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'cmake/FindWrapSystemHarfbuzz.cmake')
| -rw-r--r-- | cmake/FindWrapSystemHarfbuzz.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake index 9651c56a95..07b3405bc0 100644 --- a/cmake/FindWrapSystemHarfbuzz.cmake +++ b/cmake/FindWrapSystemHarfbuzz.cmake @@ -32,12 +32,8 @@ endif() if(__harfbuzz_broken_config_file OR NOT __harfbuzz_found) find_package(PkgConfig QUIET) - if(PKG_CONFIG_EXECUTABLE MATCHES "pkgconf") - # pkgconf is an alternative implementation of pkg-config - set(pkgconf_is_used TRUE) - endif() pkg_check_modules(PC_HARFBUZZ IMPORTED_TARGET "harfbuzz") - if(PC_HARFBUZZ_FOUND AND NOT pkgconf_is_used) + if(PC_HARFBUZZ_FOUND) set(__harfbuzz_target_name "PkgConfig::PC_HARFBUZZ") set(__harfbuzz_find_include_dirs_hints HINTS ${PC_HARFBUZZ_INCLUDEDIR}) @@ -59,7 +55,7 @@ if(__harfbuzz_broken_config_file OR NOT __harfbuzz_found) if(HARFBUZZ_INCLUDE_DIRS AND HARFBUZZ_LIBRARIES) set(__harfbuzz_found TRUE) - if(NOT PC_HARFBUZZ_FOUND OR pkgconf_is_used) + if(NOT PC_HARFBUZZ_FOUND) add_library(${__harfbuzz_target_name} UNKNOWN IMPORTED) list(TRANSFORM HARFBUZZ_INCLUDE_DIRS APPEND "/harfbuzz") set_target_properties(${__harfbuzz_target_name} PROPERTIES |