From a2057ebc6f7a6f2bfb1d861b395e7c0f3e775564 Mon Sep 17 00:00:00 2001 From: Yehoshua Pesach Wallach Date: Thu, 28 Apr 2022 23:04:45 +0300 Subject: [PATCH] fontgen: changes to allow CMake to work from other project --- src/displayapp/fonts/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/displayapp/fonts/CMakeLists.txt b/src/displayapp/fonts/CMakeLists.txt index 3add233f..ea61c3a2 100644 --- a/src/displayapp/fonts/CMakeLists.txt +++ b/src/displayapp/fonts/CMakeLists.txt @@ -4,16 +4,16 @@ set(FONTS jetbrains_mono_42 jetbrains_mono_76 jetbrains_mono_bold_20 jetbrains_mono_extrabold_compressed lv_font_navi_80 lv_font_sys_48 open_sans_light) find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED) -configure_file(displayapp/fonts/jetbrains_mono_bold_20.c_zero.patch +configure_file(${CMAKE_CURRENT_LIST_DIR}/jetbrains_mono_bold_20.c_zero.patch displayapp/fonts/jetbrains_mono_bold_20.c_zero.patch COPYONLY) foreach(FONT ${FONTS}) set_source_files_properties(displayapp/fonts/${FONT}.c PROPERTIES GENERATED TRUE) add_custom_command(OUTPUT displayapp/fonts/${FONT}.c - COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/displayapp/fonts/generate.py - -f ${FONT} ${CMAKE_CURRENT_SOURCE_DIR}/displayapp/fonts/fonts.json - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/displayapp/fonts/fonts.json + COMMAND python ${CMAKE_CURRENT_LIST_DIR}/generate.py + -f ${FONT} ${CMAKE_CURRENT_LIST_DIR}/fonts.json + DEPENDS ${CMAKE_CURRENT_LIST_DIR}/fonts.json WORKING_DIRECTORY displayapp/fonts ) endforeach()