From 40e994dca3c64d64f0d7413d368d7f147a7e6b3f Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 9 Jan 2020 10:59:20 +0100 Subject: [PATCH] Compilation fix --- radio/src/bitmaps/128x64/CMakeLists.txt | 4 ++++ radio/src/bitmaps/212x64/CMakeLists.txt | 4 ++++ radio/src/gui/common/stdlcd/CMakeLists.txt | 4 ---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/radio/src/bitmaps/128x64/CMakeLists.txt b/radio/src/bitmaps/128x64/CMakeLists.txt index 4b77fe48d..ff42d4207 100644 --- a/radio/src/bitmaps/128x64/CMakeLists.txt +++ b/radio/src/bitmaps/128x64/CMakeLists.txt @@ -1,5 +1,9 @@ +set(FONT "STD" CACHE STRING "Choose font : STD or SQT5") +set_property(CACHE FONT PROPERTY STRINGS "STD" "SQT5") string(TOLOWER "${FONT}" FONT_DIR) + set(STICKS_ARGS --rows 4) + add_bitmaps_target(9x_xbm_1bit ${RADIO_SRC_DIR}/bitmaps/sticks.xbm 1bit "${STICKS_ARGS}") # 1bit format, 1byte size, split into 4 rows add_bitmaps_target(9x_bitmaps ${RADIO_SRC_DIR}/bitmaps/128x64/*.png 1bit "") # 1bit format, 1byte size, 1 row add_fonts_target(9x_fonts_1bit ${RADIO_SRC_DIR}/fonts/${FONT_DIR}/*.png) diff --git a/radio/src/bitmaps/212x64/CMakeLists.txt b/radio/src/bitmaps/212x64/CMakeLists.txt index 8e2a11e53..11584d0f8 100644 --- a/radio/src/bitmaps/212x64/CMakeLists.txt +++ b/radio/src/bitmaps/212x64/CMakeLists.txt @@ -1,5 +1,9 @@ +set(FONT "STD" CACHE STRING "Choose font : STD or SQT5") +set_property(CACHE FONT PROPERTY STRINGS "STD" "SQT5") string(TOLOWER "${FONT}" FONT_DIR) + set(STICKS_ARGS --rows 4) + add_bitmaps_target(taranis_xbm ${RADIO_SRC_DIR}/bitmaps/sticks.xbm 1bit "${STICKS_ARGS}") # 1bit format, 1byte size, split into 4 rows add_fonts_target(taranis_fonts ${RADIO_SRC_DIR}/fonts/${FONT_DIR}/*.png) add_bitmaps_target(taranis_bitmaps ${RADIO_SRC_DIR}/bitmaps/212x64/*.png 4bits "") diff --git a/radio/src/gui/common/stdlcd/CMakeLists.txt b/radio/src/gui/common/stdlcd/CMakeLists.txt index aaedd18ba..f57959f06 100644 --- a/radio/src/gui/common/stdlcd/CMakeLists.txt +++ b/radio/src/gui/common/stdlcd/CMakeLists.txt @@ -1,6 +1,3 @@ -set(FONT "STD" CACHE STRING "Choose font : STD or SQT5") -set_property(CACHE FONT PROPERTY STRINGS SQT5) - add_definitions(-DGRAPHICS) set(GUI_SRC @@ -50,4 +47,3 @@ if(PXX2 OR MULTIMODULE) ../common/stdlcd/radio_spectrum_analyser.cpp ) endif() -