1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Find system harfbuzz even if pkg-config is disabled

Browse Source 
FindWrapSystemHarfbuzz.cmake relied on pkg-config to find system
harfbuzz.  This patch makes it find system harfbuzz even if pkg-config
is not available or disabled.

Pick-to: 6.2 6.3 6.4
Task-number: QTBUG-103894
Change-Id: I2a8fc64c738c7604f47de89f387002e40a9fa5e0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2022-06-09 17:37:34 +02:00
parent 71a0b893fb
commit f318c0e2d6
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cmake/FindWrapSystemHarfbuzz.cmake
View File

@ -28,23 +28,38 @@ if(harfbuzz_FOUND AND TARGET "${__harfbuzz_target_name}")
endif() endif()
if(__harfbuzz_broken_config_file OR NOT __harfbuzz_found) if(__harfbuzz_broken_config_file OR NOT __harfbuzz_found)
list(PREPEND WrapSystemHarfbuzz_REQUIRED_VARS HARFBUZZ_LIBRARIES HARFBUZZ_INCLUDE_DIRS)
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)
pkg_check_modules(PC_HARFBUZZ harfbuzz IMPORTED_TARGET) pkg_check_modules(PC_HARFBUZZ harfbuzz IMPORTED_TARGET)
if(PC_HARFBUZZ_FOUND) 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_target_name "PkgConfig::PC_HARFBUZZ")
set(__harfbuzz_found TRUE) set(__harfbuzz_find_include_dirs_hints
HINTS ${PC_HARFBUZZ_INCLUDEDIR})
set(__harfbuzz_find_library_hints
HINTS ${PC_HARFBUZZ_LIBDIR})
if(PC_HARFBUZZ_VERSION) if(PC_HARFBUZZ_VERSION)
set(WrapSystemHarfbuzz_VERSION "${PC_HARFBUZZ_VERSION}") set(WrapSystemHarfbuzz_VERSION "${PC_HARFBUZZ_VERSION}")
endif() endif()
else()
set(__harfbuzz_target_name "Harfbuzz::Harfbuzz")
endif()
find_path(HARFBUZZ_INCLUDE_DIRS
NAMES harfbuzz/hb.h
${__harfbuzz_find_include_dirs_hints})
find_library(HARFBUZZ_LIBRARIES
NAMES harfbuzz
${__harfbuzz_find_library_hints})
if(HARFBUZZ_INCLUDE_DIRS AND HARFBUZZ_LIBRARIES)
set(__harfbuzz_found TRUE)
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
IMPORTED_LOCATION "${HARFBUZZ_LIBRARIES}"
INTERFACE_INCLUDE_DIRECTORIES "${HARFBUZZ_INCLUDE_DIRS}"
)
endif()
endif() endif()
endif() endif()
@ -58,6 +73,8 @@ if(WrapSystemHarfbuzz_FOUND)
INTERFACE "${__harfbuzz_target_name}") INTERFACE "${__harfbuzz_target_name}")
endif() endif()
unset(__harfbuzz_target_name) unset(__harfbuzz_target_name)
unset(__harfbuzz_find_include_dirs_hints)
unset(__harfbuzz_find_library_hints)
unset(__harfbuzz_found) unset(__harfbuzz_found)
unset(__harfbuzz_include_dir) unset(__harfbuzz_include_dir)
unset(__harfbuzz_broken_config_file) unset(__harfbuzz_broken_config_file)