From 2cc02a84e1fe285f72eee44490a0a582d0abbc95 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Mon, 17 Jun 2019 17:46:51 +0200
Subject: [PATCH] Cosmetics

---
 radio/src/gui/128x64/CMakeLists.txt          | 47 +++++++++++++++++
 radio/src/gui/212x64/CMakeLists.txt          | 47 +++++++++++++++++
 radio/src/gui/480x272/CMakeLists.txt         | 47 +++++++++++++++++
 radio/src/gui/CMakeLists.txt                 | 55 ++------------------
 radio/src/gui/common/colorlcd/CMakeLists.txt |  9 ++++
 5 files changed, 153 insertions(+), 52 deletions(-)
 create mode 100644 radio/src/gui/128x64/CMakeLists.txt
 create mode 100644 radio/src/gui/212x64/CMakeLists.txt
 create mode 100644 radio/src/gui/480x272/CMakeLists.txt
 create mode 100644 radio/src/gui/common/colorlcd/CMakeLists.txt

diff --git a/radio/src/gui/128x64/CMakeLists.txt b/radio/src/gui/128x64/CMakeLists.txt
new file mode 100644
index 000000000..da222492c
--- /dev/null
+++ b/radio/src/gui/128x64/CMakeLists.txt
@@ -0,0 +1,47 @@
+set(GUI_SRC
+  ${GUI_SRC}
+  lcd.cpp
+  splash.cpp
+  fonts.cpp
+  popups.cpp
+  widgets.cpp
+  menu_model.cpp
+  model_select.cpp
+  model_setup.cpp
+  model_failsafe.cpp
+  model_logical_switches.cpp
+  special_functions.cpp
+  model_outputs.cpp
+  model_telemetry.cpp
+  model_telemetry_sensor.cpp
+  menu_radio.cpp
+  radio_setup.cpp
+  radio_trainer.cpp
+  radio_version.cpp
+  radio_hardware.cpp
+  radio_calibration.cpp
+  view_main.cpp
+  view_statistics.cpp
+  )
+
+set(SRC
+  ${SRC}
+  gui/common/widgets.cpp
+  gui/common/arm/widgets.cpp
+  )
+
+if(FLIGHT_MODES)
+  set(GUI_SRC
+    ${GUI_SRC}
+    model_flightmodes.cpp
+    )
+endif()
+
+if(LUA STREQUAL YES)
+  set(GUI_SRC
+    ${GUI_SRC}
+    model_custom_scripts.cpp
+    )
+endif()
+
+include(gui/common/stdlcd/CMakeLists.txt)
diff --git a/radio/src/gui/212x64/CMakeLists.txt b/radio/src/gui/212x64/CMakeLists.txt
new file mode 100644
index 000000000..da222492c
--- /dev/null
+++ b/radio/src/gui/212x64/CMakeLists.txt
@@ -0,0 +1,47 @@
+set(GUI_SRC
+  ${GUI_SRC}
+  lcd.cpp
+  splash.cpp
+  fonts.cpp
+  popups.cpp
+  widgets.cpp
+  menu_model.cpp
+  model_select.cpp
+  model_setup.cpp
+  model_failsafe.cpp
+  model_logical_switches.cpp
+  special_functions.cpp
+  model_outputs.cpp
+  model_telemetry.cpp
+  model_telemetry_sensor.cpp
+  menu_radio.cpp
+  radio_setup.cpp
+  radio_trainer.cpp
+  radio_version.cpp
+  radio_hardware.cpp
+  radio_calibration.cpp
+  view_main.cpp
+  view_statistics.cpp
+  )
+
+set(SRC
+  ${SRC}
+  gui/common/widgets.cpp
+  gui/common/arm/widgets.cpp
+  )
+
+if(FLIGHT_MODES)
+  set(GUI_SRC
+    ${GUI_SRC}
+    model_flightmodes.cpp
+    )
+endif()
+
+if(LUA STREQUAL YES)
+  set(GUI_SRC
+    ${GUI_SRC}
+    model_custom_scripts.cpp
+    )
+endif()
+
+include(gui/common/stdlcd/CMakeLists.txt)
diff --git a/radio/src/gui/480x272/CMakeLists.txt b/radio/src/gui/480x272/CMakeLists.txt
new file mode 100644
index 000000000..1a722278f
--- /dev/null
+++ b/radio/src/gui/480x272/CMakeLists.txt
@@ -0,0 +1,47 @@
+set(GUI_SRC
+  ${GUI_SRC}
+  lcd.cpp
+  splash.cpp
+  fonts.cpp
+  popups.cpp
+  widgets.cpp
+  menu_model.cpp
+  model_select.cpp
+  model_setup.cpp
+  model_failsafe.cpp
+  model_logical_switches.cpp
+  model_special_functions.cpp
+  model_outputs.cpp
+  model_telemetry.cpp
+  model_telemetry_sensor.cpp
+  menu_radio.cpp
+  radio_setup.cpp
+  radio_trainer.cpp
+  radio_version.cpp
+  radio_hardware.cpp
+  radio_calibration.cpp
+  view_main.cpp
+  view_statistics.cpp
+  )
+
+set(SRC
+  ${SRC}
+  gui/common/widgets.cpp
+  gui/common/arm/widgets.cpp
+  )
+
+if(FLIGHT_MODES)
+  set(GUI_SRC
+    ${GUI_SRC}
+    model_flightmodes.cpp
+    )
+endif()
+
+if(LUA STREQUAL YES)
+  set(GUI_SRC
+    ${GUI_SRC}
+    model_custom_scripts.cpp
+    )
+endif()
+
+include(gui/common/colorlcd/CMakeLists.txt)
diff --git a/radio/src/gui/CMakeLists.txt b/radio/src/gui/CMakeLists.txt
index 5c13c957c..0e42d74ec 100644
--- a/radio/src/gui/CMakeLists.txt
+++ b/radio/src/gui/CMakeLists.txt
@@ -1,60 +1,11 @@
-set(GUI_SRC
-  ${GUI_SRC}
-  lcd.cpp
-  splash.cpp
-  fonts.cpp
-  popups.cpp
-  widgets.cpp
-  menu_model.cpp
-  model_select.cpp
-  model_setup.cpp
-  model_outputs.cpp
-  model_failsafe.cpp
-  model_logical_switches.cpp
-  model_special_functions.cpp
-  model_telemetry.cpp
-  model_telemetry_sensor.cpp
-  menu_radio.cpp
-  radio_setup.cpp
-  radio_trainer.cpp
-  radio_version.cpp
-  radio_calibration.cpp
-  view_main.cpp
-  view_statistics.cpp
-  )
+include(gui/${GUI_DIR}/CMakeLists.txt)
+include_directories(gui gui/${GUI_DIR})
 
 set(SRC
   ${SRC}
-  gui/common/widgets.cpp
-  gui/navigation/navigation_${NAVIGATION_TYPE}.cpp
   gui/navigation/common.cpp
+  gui/navigation/navigation_${NAVIGATION_TYPE}.cpp
   )
 
-
 string(TOUPPER ${NAVIGATION_TYPE} NAVIGATION_TYPE)
 add_definitions(-DNAVIGATION_${NAVIGATION_TYPE})
-
-include_directories(gui gui/${GUI_DIR})
-
-if(GUI_DIR STREQUAL 128x64 OR GUI_DIR STREQUAL 212x64)
-  include(gui/common/stdlcd/CMakeLists.txt)
-endif()
-
-if(ARCH STREQUAL ARM)
-  set(SRC
-    ${SRC}
-    gui/common/arm/widgets.cpp
-    )
-endif()
-
-if(PCB STREQUAL X12S OR PCB STREQUAL X10)
-  if(HELI)
-    set(HELI_SRC gui/common/colorlcd/model_heli.cpp)
-  endif()
-
-  set(SRC
-    ${SRC}
-    gui/common/colorlcd/widgets.cpp
-    ${HELI_SRC}
-    )
-endif()
diff --git a/radio/src/gui/common/colorlcd/CMakeLists.txt b/radio/src/gui/common/colorlcd/CMakeLists.txt
new file mode 100644
index 000000000..81271fe23
--- /dev/null
+++ b/radio/src/gui/common/colorlcd/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(GUI_SRC
+  ${GUI_SRC}
+  ../common/colorlcd/widgets.cpp
+  )
+
+if(HELI)
+  set(GUI_SRC ${GUI_SRC} ../common/colorlcd/model_heli.cpp)
+endif()
+