From 8aac89e5495e639e97a72d42bc6338975c884f84 Mon Sep 17 00:00:00 2001 From: Janne M Date: Fri, 30 Sep 2011 11:17:08 +0300 Subject: [PATCH] Fixed board setting in cmake-file. Removed now autogenerated Makefile --- ArduPlane/CMakeLists.txt | 8 +++++++- ArduPlane/Makefile | 10 ---------- 2 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 ArduPlane/Makefile diff --git a/ArduPlane/CMakeLists.txt b/ArduPlane/CMakeLists.txt index 33bddb959a..9b53e492be 100644 --- a/ArduPlane/CMakeLists.txt +++ b/ArduPlane/CMakeLists.txt @@ -22,12 +22,18 @@ project(ArduPlane C CXX) find_package(Arduino 22 REQUIRED) +if (NOT DEFINED BOARD) + message(STATUS "board not defined, assuming mega, use cmake -DBOARD=mega2560 , etc. to specify") + set(BOARD "mega") +endif() +message(STATUS "Board configured as: ${BOARD}") + add_subdirectory(../libraries "${CMAKE_CURRENT_BINARY_DIR}/libs") #add_subdirectory(${CMAKE_SOURCE_DIR}/ArduCopter) #add_subdirectory(testtool) -PRINT_BOARD_SETTINGS(mega2560) +PRINT_BOARD_SETTINGS(${BOARD}) diff --git a/ArduPlane/Makefile b/ArduPlane/Makefile deleted file mode 100644 index 34f8baffd9..0000000000 --- a/ArduPlane/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# -# Trivial makefile for building APM -# - -# -# Select 'mega' for the original APM, or 'mega2560' for the V2 APM. -# -BOARD = mega - -include ../libraries/AP_Common/Arduino.mk