Cmake update

Author: Angel

.gitignore

@@ -1,3 +1,4 @@
 .idea/
+cmake-build-*/
 # Created by .ignore support plugin (hsz.mobi)
 

CmakeLists.txt

@@ -11,6 +11,8 @@ generate_arduino_firmware(${CMAKE_PROJECT_NAME})
 
 set(SOURCE_FILES MID.ino)
 set(BOARD_SUB atmega2560)
+
+list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${ARDUINO_SDK}/libraries)
 #
 # Enable syntax check for Serial class from UsbApi.h
 # To set definitions use "-D"[DefName]

MID/MID.ino

@@ -23,8 +23,9 @@
 #include <MenuBackend.h>
 //#include <SoftwareSerial.h>
 #include <DallasTemperature.h>
+#include <LiquidCrystal.h>
 //#include <U8g2lib.h>
-//U8G2_T6963_240X64_2_8080 u8g2(U8G2_R0, 8, 9, 10, 11, 4, 5, 6, 7,/*WR*/ 14, /*CE*/ 16, /*dc8*/17, /*RST*/ 18);
+//U8G2_T6963_240X64_2_8080 lcd(U8G2_R0, 8, 9, 10, 11, 4, 5, 6, 7,/*WR*/ 14, /*CE*/ 16, /*dc8*/17, /*RST*/ 18);
 //
 // Serial configuration
 #define SERIAL_INJECT_DATA          // Inject data from serial monitor
@@ -134,9 +135,7 @@ const uint8_t LPG_CLC_PIN = A12;     //  [blue]      Switch button   Fuel switch
 /***************************************************************************/
 //
 //
-// LiquidCrystal library
-// Including from Arduino IDE
-#include <LiquidCrystal.h>
+
 
 
 //

cmake-build-debug/ArduinoMid.cbp

@@ -1,19 +1,5 @@
 // automatically generated by arduino-cmake
-#line 1 "C:/Users/Admin/Documents/Arduino/ArduinoMid/MID/MID.ino"
-
-#line 4 "C:/Users/Admin/Documents/Arduino/ArduinoMid/cmake-build-debug/ArduinoMid_MID.ino.cpp"
-#include "Arduino.h"
-
-//=== START Forward: C:/Users/Admin/Documents/Arduino/ArduinoMid/MID/MID.ino
- void setup() ;
- void setup() ;
- void loop() ;
- void loop() ;
- static void playWelcomeScreen() ;
- static void playWelcomeScreen() ;
-//=== END Forward: C:/Users/Admin/Documents/Arduino/ArduinoMid/MID/MID.ino
-#line 0 "C:/Users/Admin/Documents/Arduino/ArduinoMid/MID/MID.ino"
-
+#line 1 "C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/MID/MID.ino"
 
 
 /*
@@ -39,9 +25,8 @@
 #include <MenuBackend.h>
 //#include <SoftwareSerial.h>
 #include <DallasTemperature.h>
-#include <U8g2lib.h>
-#include <U8x8lib.h>
-U8G2_T6963_240X64_2_8080 u8g2(U8G2_R0, 8, 9, 10, 11, 4, 5, 6, 7,/*WR*/ 14, /*CE*/ 16, /*dc8*/17, /*RST*/ 18);
+//#include <U8g2lib.h>
+//U8G2_T6963_240X64_2_8080 u8g2(U8G2_R0, 8, 9, 10, 11, 4, 5, 6, 7,/*WR*/ 14, /*CE*/ 16, /*dc8*/17, /*RST*/ 18);
 //
 // Serial configuration
 #define SERIAL_INJECT_DATA          // Inject data from serial monitor
@@ -61,6 +46,20 @@ U8G2_T6963_240X64_2_8080 u8g2(U8G2_R0, 8, 9, 10, 11, 4, 5, 6, 7,/*WR*/ 14, /*CE*
 // MID plug pins definition over Arduino
 //
 // Define button pins for steering controller
+#line 50 "C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/cmake-build-debug/ArduinoMid_MID.ino.cpp"
+#include "Arduino.h"
+
+//=== START Forward: C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/MID/MID.ino
+ void setup() ;
+ void setup() ;
+ void loop() ;
+ void loop() ;
+ static void playWelcomeScreen() ;
+ static void playWelcomeScreen() ;
+//=== END Forward: C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/MID/MID.ino
+#line 45 "C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/MID/MID.ino"
+
+
 const uint8_t BTN_PIN_UP = 8;       //  Plug:23     Column switch
 const uint8_t BTN_PIN_DW = 9;       //  Plug:24     Column switch navigation
 //

cmake-build-debug/ArduinoMid_MID.ino.cpp

@@ -33,28 +33,28 @@ cmake_force:
 SHELL = cmd.exe
 
 # The CMake executable.
-CMAKE_COMMAND = "C:\Program Files (x86)\JetBrains\CLion 2016.3\bin\cmake\bin\cmake.exe"
+CMAKE_COMMAND = "C:\Program Files (x86)\JetBrains\CLion 2016.3.2\bin\cmake\bin\cmake.exe"
 
 # The command to remove a file.
-RM = "C:\Program Files (x86)\JetBrains\CLion 2016.3\bin\cmake\bin\cmake.exe" -E remove -f
+RM = "C:\Program Files (x86)\JetBrains\CLion 2016.3.2\bin\cmake\bin\cmake.exe" -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = C:\Users\Admin\Documents\Arduino\ArduinoMid
+CMAKE_SOURCE_DIR = "C:\Users\Angel Zaprianov\Documents\Arduino\ArduinoMid"
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = C:\Users\Admin\Documents\Arduino\ArduinoMid\cmake-build-debug
+CMAKE_BINARY_DIR = "C:\Users\Angel Zaprianov\Documents\Arduino\ArduinoMid\cmake-build-debug"
 
 # Utility rule file for ArduinoMid-size.
 
 # Include the progress variables for this target.
 include CMakeFiles/ArduinoMid-size.dir/progress.make
 
 CMakeFiles/ArduinoMid-size: ArduinoMid.elf
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir=C:\Users\Admin\Documents\Arduino\ArduinoMid\cmake-build-debug\CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Calculating ArduinoMid image size"
-	"C:\Program Files (x86)\JetBrains\CLion 2016.3\bin\cmake\bin\cmake.exe" -DFIRMWARE_IMAGE=C:/Users/Admin/Documents/Arduino/ArduinoMid/cmake-build-debug/ArduinoMid.elf -DMCU= -DEEPROM_IMAGE=C:/Users/Admin/Documents/Arduino/ArduinoMid/cmake-build-debug/ArduinoMid.eep -P C:/Users/Admin/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/FirmwareSize.cmake
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir="C:\Users\Angel Zaprianov\Documents\Arduino\ArduinoMid\cmake-build-debug\CMakeFiles" --progress-num=$(CMAKE_PROGRESS_1) "Calculating ArduinoMid image size"
+	"C:\Program Files (x86)\JetBrains\CLion 2016.3.2\bin\cmake\bin\cmake.exe" "-DFIRMWARE_IMAGE=C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/cmake-build-debug/ArduinoMid.elf" -DMCU= "-DEEPROM_IMAGE=C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/cmake-build-debug/ArduinoMid.eep" -P "C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/FirmwareSize.cmake"
 
 ArduinoMid-size: CMakeFiles/ArduinoMid-size
 ArduinoMid-size: CMakeFiles/ArduinoMid-size.dir/build.make
@@ -71,6 +71,6 @@ CMakeFiles/ArduinoMid-size.dir/clean:
 .PHONY : CMakeFiles/ArduinoMid-size.dir/clean
 
 CMakeFiles/ArduinoMid-size.dir/depend:
-	$(CMAKE_COMMAND) -E cmake_depends "MinGW Makefiles" C:\Users\Admin\Documents\Arduino\ArduinoMid C:\Users\Admin\Documents\Arduino\ArduinoMid C:\Users\Admin\Documents\Arduino\ArduinoMid\cmake-build-debug C:\Users\Admin\Documents\Arduino\ArduinoMid\cmake-build-debug C:\Users\Admin\Documents\Arduino\ArduinoMid\cmake-build-debug\CMakeFiles\ArduinoMid-size.dir\DependInfo.cmake --color=$(COLOR)
+	$(CMAKE_COMMAND) -E cmake_depends "MinGW Makefiles" "C:\Users\Angel Zaprianov\Documents\Arduino\ArduinoMid" "C:\Users\Angel Zaprianov\Documents\Arduino\ArduinoMid" "C:\Users\Angel Zaprianov\Documents\Arduino\ArduinoMid\cmake-build-debug" "C:\Users\Angel Zaprianov\Documents\Arduino\ArduinoMid\cmake-build-debug" "C:\Users\Angel Zaprianov\Documents\Arduino\ArduinoMid\cmake-build-debug\CMakeFiles\ArduinoMid-size.dir\DependInfo.cmake" --color=$(COLOR)
 .PHONY : CMakeFiles/ArduinoMid-size.dir/depend
 

cmake-build-debug/CMakeCache.txt

@@ -33,27 +33,27 @@ cmake_force:
 SHELL = cmd.exe
 
 # The CMake executable.
-CMAKE_COMMAND = "C:\Program Files (x86)\JetBrains\CLion 2016.3\bin\cmake\bin\cmake.exe"
+CMAKE_COMMAND = "C:\Program Files (x86)\JetBrains\CLion 2016.3.2\bin\cmake\bin\cmake.exe"
 
 # The command to remove a file.
-RM = "C:\Program Files (x86)\JetBrains\CLion 2016.3\bin\cmake\bin\cmake.exe" -E remove -f
+RM = "C:\Program Files (x86)\JetBrains\CLion 2016.3.2\bin\cmake\bin\cmake.exe" -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = C:\Users\Admin\Documents\Arduino\ArduinoMid
+CMAKE_SOURCE_DIR = "C:\Users\Angel Zaprianov\Documents\Arduino\ArduinoMid"
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = C:\Users\Admin\Documents\Arduino\ArduinoMid\cmake-build-debug
+CMAKE_BINARY_DIR = "C:\Users\Angel Zaprianov\Documents\Arduino\ArduinoMid\cmake-build-debug"
 
 # Utility rule file for ArduinoMid-upload.
 
 # Include the progress variables for this target.
 include CMakeFiles/ArduinoMid-upload.dir/progress.make
 
 CMakeFiles/ArduinoMid-upload: ArduinoMid.elf
-	"C:\Program Files (x86)\Arduino\hardware\tools\avr\bin\avrdude.exe" "-CC:/Program Files (x86)/Arduino/hardware/tools/avr/etc/avrdude.conf" -p -cstk500v1 -b19200 -P/dev/ttys3 -D -V -Uflash:w:C:/Users/Admin/Documents/Arduino/ArduinoMid/cmake-build-debug/ArduinoMid.hex:i -Ueeprom:w:C:/Users/Admin/Documents/Arduino/ArduinoMid/cmake-build-debug/ArduinoMid.eep:i
+	"C:\Program Files (x86)\Arduino\hardware\tools\avr\bin\avrdude.exe" "-CC:/Program Files (x86)/Arduino/hardware/tools/avr/etc/avrdude.conf" -p -cstk500v1 -b19200 -P/dev/ttys3 -D -V "-Uflash:w:C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/cmake-build-debug/ArduinoMid.hex:i" "-Ueeprom:w:C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/cmake-build-debug/ArduinoMid.eep:i"
 
 ArduinoMid-upload: CMakeFiles/ArduinoMid-upload
 ArduinoMid-upload: CMakeFiles/ArduinoMid-upload.dir/build.make
@@ -70,6 +70,6 @@ CMakeFiles/ArduinoMid-upload.dir/clean:
 .PHONY : CMakeFiles/ArduinoMid-upload.dir/clean
 
 CMakeFiles/ArduinoMid-upload.dir/depend:
-	$(CMAKE_COMMAND) -E cmake_depends "MinGW Makefiles" C:\Users\Admin\Documents\Arduino\ArduinoMid C:\Users\Admin\Documents\Arduino\ArduinoMid C:\Users\Admin\Documents\Arduino\ArduinoMid\cmake-build-debug C:\Users\Admin\Documents\Arduino\ArduinoMid\cmake-build-debug C:\Users\Admin\Documents\Arduino\ArduinoMid\cmake-build-debug\CMakeFiles\ArduinoMid-upload.dir\DependInfo.cmake --color=$(COLOR)
+	$(CMAKE_COMMAND) -E cmake_depends "MinGW Makefiles" "C:\Users\Angel Zaprianov\Documents\Arduino\ArduinoMid" "C:\Users\Angel Zaprianov\Documents\Arduino\ArduinoMid" "C:\Users\Angel Zaprianov\Documents\Arduino\ArduinoMid\cmake-build-debug" "C:\Users\Angel Zaprianov\Documents\Arduino\ArduinoMid\cmake-build-debug" "C:\Users\Angel Zaprianov\Documents\Arduino\ArduinoMid\cmake-build-debug\CMakeFiles\ArduinoMid-upload.dir\DependInfo.cmake" --color=$(COLOR)
 .PHONY : CMakeFiles/ArduinoMid-upload.dir/depend
 

cmake-build-debug/CMakeFiles/ArduinoMid-size.dir/build.make

@@ -4,7 +4,7 @@ set(CMAKE_DEPENDS_LANGUAGES
   )
 # The set of files for implicit dependencies of each language:
 set(CMAKE_DEPENDS_CHECK_CXX
-  "C:/Users/Admin/Documents/Arduino/ArduinoMid/cmake-build-debug/ArduinoMid_MID.ino.cpp" "C:/Users/Admin/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/ArduinoMid.dir/ArduinoMid_MID.ino.cpp.obj"
+  "C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/cmake-build-debug/ArduinoMid_MID.ino.cpp" "C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/ArduinoMid.dir/ArduinoMid_MID.ino.cpp.obj"
   )
 set(CMAKE_CXX_COMPILER_ID "GNU")
 
@@ -43,15 +43,15 @@ set(CMAKE_CXX_TARGET_INCLUDE_PATH
 
 # Targets to which this target links.
 set(CMAKE_TARGET_LINKED_INFO_FILES
-  "C:/Users/Admin/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_SPI.dir/DependInfo.cmake"
-  "C:/Users/Admin/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_Wire.dir/DependInfo.cmake"
-  "C:/Users/Admin/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_twi.dir/DependInfo.cmake"
-  "C:/Users/Admin/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_OneWire.dir/DependInfo.cmake"
-  "C:/Users/Admin/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_Firmata.dir/DependInfo.cmake"
-  "C:/Users/Admin/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_MenuBackend.dir/DependInfo.cmake"
-  "C:/Users/Admin/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_DallasTemperature.dir/DependInfo.cmake"
-  "C:/Users/Admin/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_LiquidCrystal.dir/DependInfo.cmake"
-  "C:/Users/Admin/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_CORE.dir/DependInfo.cmake"
+  "C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_SPI.dir/DependInfo.cmake"
+  "C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_Wire.dir/DependInfo.cmake"
+  "C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_twi.dir/DependInfo.cmake"
+  "C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_OneWire.dir/DependInfo.cmake"
+  "C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_Firmata.dir/DependInfo.cmake"
+  "C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_MenuBackend.dir/DependInfo.cmake"
+  "C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_DallasTemperature.dir/DependInfo.cmake"
+  "C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_LiquidCrystal.dir/DependInfo.cmake"
+  "C:/Users/Angel Zaprianov/Documents/Arduino/ArduinoMid/cmake-build-debug/CMakeFiles/mega_CORE.dir/DependInfo.cmake"
   )
 
 # Fortran module output directory.