From 10914c741c3cf18d740a4f945f93be9155e5c25d Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 19 Nov 2016 20:47:04 +0100 Subject: [PATCH] Fix compile with gvars (#4046) * Fix compile with gvars * Rework --- radio/src/targets/common/arm/stm32/CMakeLists.txt | 2 +- radio/src/targets/horus/CMakeLists.txt | 1 + radio/src/targets/taranis/CMakeLists.txt | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/radio/src/targets/common/arm/stm32/CMakeLists.txt b/radio/src/targets/common/arm/stm32/CMakeLists.txt index 058076780..1343306ca 100644 --- a/radio/src/targets/common/arm/stm32/CMakeLists.txt +++ b/radio/src/targets/common/arm/stm32/CMakeLists.txt @@ -63,7 +63,7 @@ endif() if(GVARS) set(GUI_SRC ${GUI_SRC} - model_gvars.cpp + ${GVAR_SCREEN} ) endif() set(FIRMWARE_SRC diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt index 8b257bc42..769c7eda1 100644 --- a/radio/src/targets/horus/CMakeLists.txt +++ b/radio/src/targets/horus/CMakeLists.txt @@ -66,6 +66,7 @@ if(INTERNAL_GPS) message("Internal GPS enabled") endif() set(SERIAL2_DRIVER serial2_driver.cpp) +set(GVAR_SCREEN model_gvars.cpp) set(TARGET_SRC ${TARGET_SRC} board.cpp diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index 5c0e0e90c..a054ddafb 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -25,6 +25,7 @@ if(PCB STREQUAL X9E) set(GUI_SRC ${GUI_SRC} bmp.cpp) set(BITMAPS_TARGET taranis_bitmaps) set(LCD_DRIVER lcd_driver_spi.cpp) + set(GVAR_SCREEN model_gvars.cpp) elseif(PCB STREQUAL X9D+) set(CPU_TYPE STM32F2) set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld) @@ -38,6 +39,7 @@ elseif(PCB STREQUAL X9D+) set(BITMAPS_TARGET taranis_bitmaps) set(LCD_DRIVER lcd_driver_spi.cpp) set(SERIAL2_DRIVER serial2_driver.cpp) + set(GVAR_SCREEN model_gvars.cpp) elseif(PCB STREQUAL X9D) set(CPU_TYPE STM32F2) set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld) @@ -51,6 +53,7 @@ elseif(PCB STREQUAL X9D) set(BITMAPS_TARGET taranis_bitmaps) set(LCD_DRIVER lcd_driver_aspi.cpp) set(SERIAL2_DRIVER serial2_driver.cpp) + set(GVAR_SCREEN model_gvars.cpp) elseif(PCB STREQUAL X7D) set(CPU_TYPE STM32F2) set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld)