From 849b799b33b6b7614f63ecb54cc0f702f1281042 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Fri, 29 May 2015 12:05:29 +0200 Subject: [PATCH] [ES] Updated cmake files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-óff-by: Jim Martens --- es/CMakeLists.txt | 3 ++- es/blatt3/CMakeLists.txt | 13 +++++++------ es/blatt4/CMakeLists.txt | 6 ++++++ es/cmake/Platform/Arduino.cmake | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 es/blatt4/CMakeLists.txt diff --git a/es/CMakeLists.txt b/es/CMakeLists.txt index aa11477..1f38cea 100644 --- a/es/CMakeLists.txt +++ b/es/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.8.12) set(CMAKE_TOOLCHAIN_FILE cmake/ArduinoToolchain.cmake) @@ -7,3 +7,4 @@ Project(es C CXX) add_subdirectory(blatt1) add_subdirectory(blatt2) add_subdirectory(blatt3) +add_subdirectory(blatt4) diff --git a/es/blatt3/CMakeLists.txt b/es/blatt3/CMakeLists.txt index e6d8810..6132968 100644 --- a/es/blatt3/CMakeLists.txt +++ b/es/blatt3/CMakeLists.txt @@ -3,15 +3,16 @@ set(ARDUINO_DEFAULT_PORT /dev/ttyUSB0) # Default Port, when not specified generate_arduino_firmware(uebung3-1 SKETCH uebung3-1 - PROGRAMMER usbtinyisp - NO_AUTOLIBS) + PROGRAMMER usbtinyisp) generate_arduino_firmware(uebung3-2 SKETCH uebung3-2 - PROGRAMMER usbtinyisp - NO_AUTOLIBS) + PROGRAMMER usbtinyisp) generate_arduino_firmware(uebung3-3 SKETCH uebung3-3 - PROGRAMMER usbtinyisp - NO_AUTOLIBS) + PROGRAMMER usbtinyisp) + +generate_arduino_firmware(uebung3-4 + SKETCH uebung3-4 + PROGRAMMER usbtinyisp) diff --git a/es/blatt4/CMakeLists.txt b/es/blatt4/CMakeLists.txt new file mode 100644 index 0000000..9fa58a4 --- /dev/null +++ b/es/blatt4/CMakeLists.txt @@ -0,0 +1,6 @@ +set(ARDUINO_DEFAULT_BOARD diecimila) # Default Board ID, when not specified +set(ARDUINO_DEFAULT_PORT /dev/ttyUSB0) # Default Port, when not specified + +generate_arduino_firmware(uebung4-1 + SKETCH uebung4-1 + PROGRAMMER usbtinyisp) diff --git a/es/cmake/Platform/Arduino.cmake b/es/cmake/Platform/Arduino.cmake index 042a3c1..047aed8 100644 --- a/es/cmake/Platform/Arduino.cmake +++ b/es/cmake/Platform/Arduino.cmake @@ -282,7 +282,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. #=============================================================================# -cmake_minimum_required(VERSION 2.8.5) +cmake_minimum_required(VERSION 2.8.12) include(CMakeParseArguments)