diff options
| author | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2022-01-28 12:04:36 +0900 |
|---|---|---|
| committer | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2022-01-29 01:36:12 +0000 |
| commit | 35740aa6a9b1d7f711dfe41a38dde5a178443b64 (patch) | |
| tree | 6dcdcf9d1d8d8731045e43c99e0ca9bb68327cdc | |
| parent | fa226478b1dc846ba86eb364c524fb3f4c3bcd0d (diff) | |
| download | freetype2-35740aa6a9b1d7f711dfe41a38dde5a178443b64.tar.gz | |
[cmake] Check the availability of `bzip2.pc'.
(CMakeLists.txt): Check the availability of `bzip2.pc'.
* If `bzip2.pc' is available, Requires.private should include
bzip2, but Libs.private should not include -lbz2.
* If `bzip2.pc' is unavailable, Requires.private cannot include
bzip2, but Libs.private should include -lbz2.
Fix #897.
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f9a65001..4590309a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -271,11 +271,16 @@ if (NOT FT_DISABLE_ZLIB) endif () if (NOT FT_DISABLE_BZIP2) + # Genuine BZip2 does not provide bzip2.pc, but some platforms have it. + # For better dependency in freetype2.pc, bzip2.pc is searched + # regardless of the availability of libbz2. If bzip2.pc is found, + # Requires.private is used instead of Libs.private. if (FT_REQUIRE_BZIP2) find_package(BZip2 REQUIRED) else () find_package(BZip2) endif () + pkg_check_modules(PC_BZIP2 bzip2) endif () if (NOT FT_DISABLE_BROTLI) @@ -504,7 +509,11 @@ endif () if (BZIP2_FOUND) target_link_libraries(freetype PRIVATE ${BZIP2_LIBRARIES}) target_include_directories(freetype PRIVATE ${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS - list(APPEND PKG_CONFIG_LIBS_PRIVATE "-lbz2") + if (PC_BZIP2_FOUND) + list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "bzip2") + else () + list(APPEND PKG_CONFIG_LIBS_PRIVATE "-lbz2") + endif () endif () if (PNG_FOUND) target_link_libraries(freetype PRIVATE ${PNG_LIBRARIES}) |