shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

* CMakeLists.txt: Improve 'bz2' support.

Not all distributions such as FreeBSD provide a `.pc` file for
'(lib)bz2' so follow autotools and add it to `Libs.private` instead.

git/fs: mount .git/fs: mount/attach disallowed

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -443,6 +443,7 @@

 set(PKG_CONFIG_REQUIRED_PRIVATE "")

+set(PKG_CONFIG_LIBS_PRIVATE "")

 if (ZLIB_FOUND)

   target_link_libraries(freetype PRIVATE ${ZLIB_LIBRARIES})

@@ -452,7 +453,7 @@

 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_REQUIRED_PRIVATE "bzip2")

+  list(APPEND PKG_CONFIG_LIBS_PRIVATE "-lbz2")

 endif ()

 if (PNG_FOUND)

   target_link_libraries(freetype PRIVATE ${PNG_LIBRARIES})

@@ -511,7 +512,7 @@

            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})

     string(REPLACE "%REQUIRES_PRIVATE%" "${PKG_CONFIG_REQUIRED_PRIVATE}"

            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})

-    string(REPLACE "%LIBS_PRIVATE%" ""  # All libs support pkg-config

+    string(REPLACE "%LIBS_PRIVATE%" "${PKG_CONFIG_LIBS_PRIVATE}"

            FREETYPE2_PC_IN ${FREETYPE2_PC_IN})

     set(FREETYPE2_PC_IN_NAME "${PROJECT_BINARY_DIR}/freetype2.pc")

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,10 @@

+2021-02-15  Daniel E  <daniel.engberg.lists@pyret.net>

+

+	* CMakeLists.txt: Improve 'bz2' support.

+

+	Not all distributions such as FreeBSD provide a `.pc` file for

+	'(lib)bz2' so follow autotools and add it to `Libs.private` instead.

+

 2021-02-13  Werner Lemberg  <wl@gnu.org>

 	* src/tools/update-copyright-year: Fix single-year entry handling.