Another C++ conversion attempt

.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 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 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}}
 

CMakeLists.txt

@@ -4,10 +4,10 @@ project(fntsample
   VERSION 5.4
   DESCRIPTION "PDF and PostScript font samples generator"
   HOMEPAGE_URL "https://github.com/eugmes/fntsample"
-  LANGUAGES C)
+  LANGUAGES CXX)
 
-set(CMAKE_C_STANDARD 99 CACHE STRING "The C standard to use")
-set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ standard to use")
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
 
@@ -16,6 +16,7 @@ include(CPack)
 
 find_package(PkgConfig REQUIRED)
 find_package(Intl REQUIRED)
+find_package(fmt REQUIRED)
 
 # The target was added in CMake 3.20.
 if(NOT TARGET Intl::Intl)
@@ -33,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()

src/CMakeLists.txt

@@ -3,46 +3,45 @@ configure_file(fntsample.1.in fntsample.1 @ONLY)
 
 set(
   C_WARNING_FLAGS
-    -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts
+    -Wcast-align -Wchar-subscripts
     -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security
     -Wmissing-format-attribute -fno-common -Wundef
   CACHE STRING "Warning flags for C compiler"
 )
 
 add_executable(gen-unicode-blocks EXCLUDE_FROM_ALL
-  gen_unicode_blocks.c
-  read_blocks.c
+  gen_unicode_blocks.cpp
+  unicode_blocks.cpp
+  loadable_unicode_blocks.cpp
 )
 
+target_link_libraries(gen-unicode-blocks PRIVATE fmt::fmt)
+
 target_compile_options(gen-unicode-blocks PRIVATE ${C_WARNING_FLAGS})
 
 add_custom_command(
-  OUTPUT static_unicode_blocks.c
-  COMMAND gen-unicode-blocks "${UNICODE_BLOCKS}" static_unicode_blocks.c
+  OUTPUT static_unicode_blocks.cpp
+  COMMAND gen-unicode-blocks "${UNICODE_BLOCKS}" static_unicode_blocks.cpp
   MAIN_DEPENDENCY "${UNICODE_BLOCKS}"
   DEPENDS gen-unicode-blocks
   VERBATIM
 )
 
 add_executable(fntsample
-  fntsample.c
-  read_blocks.c
-  ${CMAKE_CURRENT_BINARY_DIR}/static_unicode_blocks.c
+  fntsample.cpp
+  unicode_blocks.cpp
+  loadable_unicode_blocks.cpp
+  ${CMAKE_CURRENT_BINARY_DIR}/static_unicode_blocks.cpp
 )
 
-add_translatable_sources(fntsample.c read_blocks.c)
+add_translatable_sources(fntsample.cpp unicode_blocks.cpp loadable_unicode_blocks.cpp)
 
 target_include_directories(fntsample PRIVATE
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-target_link_libraries(fntsample PRIVATE Intl::Intl PkgConfig::pkgs)
-
-find_library(MATH_LIBRARY m)
-if(MATH_LIBRARY)
-  target_link_libraries(fntsample PRIVATE ${MATH_LIBRARY})
-endif()
+target_link_libraries(fntsample PRIVATE Intl::Intl PkgConfig::pkgs fmt::fmt PkgConfig::cairomm PkgConfig::pangomm)
 
 target_compile_options(fntsample PRIVATE ${C_WARNING_FLAGS})