Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
b2aeca5f
by Daniel E at 2021-02-15T09:09:09+01:00
2 changed files:
Changes:
| ... | ... | @@ -443,6 +443,7 @@ endif () |
| 443 | 443 |
|
| 444 | 444 |
|
| 445 | 445 |
set(PKG_CONFIG_REQUIRED_PRIVATE "")
|
| 446 |
+set(PKG_CONFIG_LIBS_PRIVATE "")
|
|
| 446 | 447 |
|
| 447 | 448 |
if (ZLIB_FOUND)
|
| 448 | 449 |
target_link_libraries(freetype PRIVATE ${ZLIB_LIBRARIES})
|
| ... | ... | @@ -452,7 +453,7 @@ endif () |
| 452 | 453 |
if (BZIP2_FOUND)
|
| 453 | 454 |
target_link_libraries(freetype PRIVATE ${BZIP2_LIBRARIES})
|
| 454 | 455 |
target_include_directories(freetype PRIVATE ${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS
|
| 455 |
- list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "bzip2")
|
|
| 456 |
+ list(APPEND PKG_CONFIG_LIBS_PRIVATE "-lbz2")
|
|
| 456 | 457 |
endif ()
|
| 457 | 458 |
if (PNG_FOUND)
|
| 458 | 459 |
target_link_libraries(freetype PRIVATE ${PNG_LIBRARIES})
|
| ... | ... | @@ -511,7 +512,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) |
| 511 | 512 |
FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
|
| 512 | 513 |
string(REPLACE "%REQUIRES_PRIVATE%" "${PKG_CONFIG_REQUIRED_PRIVATE}"
|
| 513 | 514 |
FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
|
| 514 |
- string(REPLACE "%LIBS_PRIVATE%" "" # All libs support pkg-config
|
|
| 515 |
+ string(REPLACE "%LIBS_PRIVATE%" "${PKG_CONFIG_LIBS_PRIVATE}"
|
|
| 515 | 516 |
FREETYPE2_PC_IN ${FREETYPE2_PC_IN})
|
| 516 | 517 |
|
| 517 | 518 |
set(FREETYPE2_PC_IN_NAME "${PROJECT_BINARY_DIR}/freetype2.pc")
|
| 1 |
+2021-02-15 Daniel E <daniel.engberg.lists@pyret.net>
|
|
| 2 |
+ |
|
| 3 |
+ * CMakeLists.txt: Improve 'bz2' support.
|
|
| 4 |
+ |
|
| 5 |
+ Not all distributions such as FreeBSD provide a `.pc` file for
|
|
| 6 |
+ '(lib)bz2' so follow autotools and add it to `Libs.private` instead.
|
|
| 7 |
+ |
|
| 1 | 8 |
2021-02-13 Werner Lemberg <wl@gnu.org>
|
| 2 | 9 |
|
| 3 | 10 |
* src/tools/update-copyright-year: Fix single-year entry handling.
|