Use cairomm and pangomm

eugmes · Oct 6, 2021 · 84653ee · 84653ee
1 parent 1c85c08
commit 84653ee
Show file tree

Hide file tree

Showing 4 changed files with 175 additions and 184 deletions.
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})