AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Make sure that pkgconf can find HarfBuzz"

Browse Source 
This reverts commit 885d87488a.

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>
This commit is contained in:
Amir Masoud Abdol 2023-10-23 08:00:56 +00:00
parent 92194ac571
commit d7d144b530
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/FindWrapSystemHarfbuzz.cmake
View File

@ -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