Editor

cmake/font.cmake

@@ -0,0 +1,21 @@
+find_package(Python3 COMPONENTS Interpreter REQUIRED)
+execute_process(
+  COMMAND ${Python3_EXECUTABLE} -c "from PIL import features; assert features.check_feature('raqm')"
+  RESULT_VARIABLE VAMP_PILLOW_STATUS
+  ERROR_QUIET
+)
+if(NOT VAMP_PILLOW_STATUS EQUAL 0)
+  message(FATAL_ERROR "Font generation requires Pillow with Raqm support. Install libfribidi0 on Debian/Ubuntu, then run: ${Python3_EXECUTABLE} -m pip install -r ${CMAKE_CURRENT_SOURCE_DIR}/tools/requirements.txt")
+endif()
+
+set(VAMP_FONT_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/generated/vamp_style/font.cpp)
+add_custom_command(
+  OUTPUT ${VAMP_FONT_SOURCE}
+  COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/generate_pico_font.py
+    --output ${VAMP_FONT_SOURCE}
+  DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/tools/generate_pico_font.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/tools/requirements.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/package/assets/fonts/petaluma/PetalumaScript.otf
+  VERBATIM
+)

cmake/pico.cmake

@@ -36,6 +36,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 pico_sdk_init()
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/font.cmake)
 
 set(VAMP_MODULUS_INCLUDE_DIR "" CACHE PATH "Path to the Modulus public include directory")
 set(VAMP_RESOLVED_MODULUS_INCLUDE_DIR "${VAMP_MODULUS_INCLUDE_DIR}")
@@ -75,7 +76,7 @@ endif()
 
 add_executable(product-vamp-pico2w
   src/vamp_style.cpp
-  src/vamp_style/font.cpp
+  ${VAMP_FONT_SOURCE}
   src/vamp_pico/display.cpp
   src/vamp_pico/http_client.cpp
   src/vamp_pico/main.cpp

cmake/vamp_options.cmake

@@ -1,7 +1,6 @@
 option(VAMP_PICO_FIRMWARE_PROJECT "Configure this CMake invocation as the Pi Pico 2 W firmware project" OFF)
 option(VAMP_BUILD_PICO_FIRMWARE "Build the Pi Pico 2 W UF2 firmware artifact" OFF)
 option(VAMP_BUILD_ZERO_IMAGE "Build the Pi Zero 2 W Docker image archive artifact" OFF)
-option(BUILD_TESTING "Build Product Vamp tests" OFF)
 
 set(VAMP_PICO_SDK_VERSION "2.3.0" CACHE STRING "Raspberry Pi Pico SDK git tag used when fetching the SDK")
 set(VAMP_PICO_WIFI_SSID "Vamp Control" CACHE STRING "Default Pico Wi-Fi SSID")

cmake/zero.cmake

@@ -1,4 +1,5 @@
 include(GNUInstallDirs)
+option(BUILD_TESTING "Build Product Vamp tests" OFF)
 include(CTest)
 
 set(CMAKE_CXX_STANDARD 23)
@@ -11,7 +12,7 @@ find_package(ligo CONFIG REQUIRED)
 find_package(noto CONFIG REQUIRED)
 find_package(luma CONFIG REQUIRED)
 find_package(sonus CONFIG REQUIRED)
-find_package(Python3 COMPONENTS Interpreter REQUIRED)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/font.cmake)
 
 execute_process(
   COMMAND git rev-parse --short=12 HEAD
@@ -26,7 +27,7 @@ endif()
 
 set(VAMP_STYLE_SOURCES
   src/vamp_style.cpp
-  src/vamp_style/font.cpp
+  ${VAMP_FONT_SOURCE}
 )
 
 add_library(vamp-style STATIC ${VAMP_STYLE_SOURCES})
@@ -186,6 +187,10 @@ if(VAMP_BUILD_PICO_FIRMWARE)
   file(GLOB VAMP_PICO_SOURCES CONFIGURE_DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/pico.cmake
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/font.cmake
+    ${CMAKE_CURRENT_SOURCE_DIR}/tools/generate_pico_font.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/tools/requirements.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/package/assets/fonts/petaluma/PetalumaScript.otf
     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/vamp_options.cmake
     ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/vamp_style/*.hpp
@@ -194,7 +199,6 @@ if(VAMP_BUILD_PICO_FIRMWARE)
     ${CMAKE_CURRENT_SOURCE_DIR}/include/vamp_pico/*.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/vamp_protocol/*.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp_style.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp_style/*.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp_pico/*.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/vamp_protocol/*.cpp
   )