Use cairomm and pangomm

eugmes · eugmes · commit 84653ee6819d · 2021-10-06T23:52:41.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,13 +21,13 @@ jobs:
           blocks: -DUNICODE_BLOCKS=/usr/share/unicode/Blocks.txt
           install_packages: >
             sudo apt update &&
-            sudo apt install cmake gettext libcairo2-dev libglib2.0-dev libfmt-dev libfreetype6-dev libpango1.0-dev ninja-build pkg-config unicode-data
+            sudo apt install cmake gettext libcairo2-dev libcairomm-1.0-dev libglib2.0-dev libfmt-dev libfreetype6-dev libpango1.0-dev libpangomm-1.4-dev ninja-build pkg-config unicode-data
         - os: macos-latest
           env:
           - CMAKE_PREFIX_PATH: /usr/local/opt/gettext
           install_packages: >
             brew update &&
-            brew install cairo cmake fmt fontconfig freetype gettext glib pango ninja pkg-config
+            brew install cairo cairomm cmake fmt fontconfig freetype gettext glib pango pangomm ninja pkg-config
 
     runs-on: ${{matrix.os}}
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,6 +34,10 @@ pkg_check_modules(pkgs REQUIRED IMPORTED_TARGET
   pangoft2>=1.37.0
 )
 
+# FIXME: this is ugly
+pkg_search_module(cairomm REQUIRED IMPORTED_TARGET cairomm cairomm-1.16 cairomm-1.0)
+pkg_search_module(pangomm REQUIRED IMPORTED_TARGET pangomm pangomm-2.48 pangomm-1.4)
+
 include(DownloadUnicodeBlocks)
 
 download_unicode_blocks()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -41,7 +41,7 @@ target_include_directories(fntsample PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-target_link_libraries(fntsample PRIVATE Intl::Intl PkgConfig::pkgs fmt::fmt)
+target_link_libraries(fntsample PRIVATE Intl::Intl PkgConfig::pkgs fmt::fmt PkgConfig::cairomm PkgConfig::pangomm)
 
 target_compile_options(fntsample PRIVATE ${C_WARNING_FLAGS})
 
diff --git a/src/fntsample.cpp b/src/fntsample.cpp

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,10 @@ pkg_check_modules(pkgs REQUIRED IMPORTED_TARGET`
`34`	`34`	`pangoft2>=1.37.0`
`35`	`35`	`)`
`36`	`36`
	`37`	`+# FIXME: this is ugly`
	`38`	`+pkg_search_module(cairomm REQUIRED IMPORTED_TARGET cairomm cairomm-1.16 cairomm-1.0)`
	`39`	`+pkg_search_module(pangomm REQUIRED IMPORTED_TARGET pangomm pangomm-2.48 pangomm-1.4)`
	`40`	`+`
`37`	`41`	`include(DownloadUnicodeBlocks)`
`38`	`42`
`39`	`43`	`download_unicode_blocks()`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ target_include_directories(fntsample PRIVATE`
`41`	`41`	`${CMAKE_CURRENT_SOURCE_DIR}`
`42`	`42`	`)`
`43`	`43`
`44`		`-target_link_libraries(fntsample PRIVATE Intl::Intl PkgConfig::pkgs fmt::fmt)`
	`44`	`+target_link_libraries(fntsample PRIVATE Intl::Intl PkgConfig::pkgs fmt::fmt PkgConfig::cairomm PkgConfig::pangomm)`
`45`	`45`
`46`	`46`	`target_compile_options(fntsample PRIVATE ${C_WARNING_FLAGS})`
`47`	`47`