From 7bcacfb3be87f2cf557c56ef1df36a23c8282246 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 28 Oct 2019 15:32:46 +0100 Subject: [PATCH] Compilation fix --- radio/src/CMakeLists.txt | 6 ------ radio/src/gui/common/stdlcd/CMakeLists.txt | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index 1e8c2b0e8..275c95988 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -14,8 +14,6 @@ set_property(CACHE SPLASH PROPERTY STRINGS DEFAULT OFF FRSKY) set(PPM_UNIT "PERCENT_PREC1" CACHE STRING "PPM display unit (US/PERCENT_PREC1/PERCENT_PREC0)") set_property(CACHE PPM_UNIT PROPERTY STRINGS US PERCENT_PREC1 PERCENT_PREC0) set(DEFAULT_MODE "" CACHE STRING "Default sticks mode") -set(FONT "STD" CACHE STRING "Choose font : STD or SQT5") -set_property(CACHE FONT PROPERTY STRINGS SQT5) set(POPUP_LEVEL 2 CACHE STRING "Popup level") option(HELI "Heli menu" ON) @@ -311,10 +309,6 @@ if(FLYSKY_HALL_STICKS_REVERSE) add_definitions(-DFLYSKY_HALL_STICKS_REVERSE) endif() -#if(NOT FONT STREQUAL "") -# add_definitions(-DFONT=${DEFAULT_MODE}) -#endif() - if(EEPROM_VARIANT_NEEDED) add_definitions(-DEEPROM_VARIANT=${EEPROM_VARIANT}) endif() diff --git a/radio/src/gui/common/stdlcd/CMakeLists.txt b/radio/src/gui/common/stdlcd/CMakeLists.txt index a1c60a1e3..c558676a6 100644 --- a/radio/src/gui/common/stdlcd/CMakeLists.txt +++ b/radio/src/gui/common/stdlcd/CMakeLists.txt @@ -1,3 +1,6 @@ +set(FONT "STD" CACHE STRING "Choose font : STD or SQT5") +set_property(CACHE FONT PROPERTY STRINGS SQT5) + add_definitions(-DGRAPHICS) set(GUI_SRC