From 51cfe41a5d307318b2bc26c225d545af0fd5e7af Mon Sep 17 00:00:00 2001 From: Lucas Baudin Date: Thu, 15 Oct 2015 20:00:39 +0200 Subject: [PATCH 1/2] Add another platform path (for newer arduinos?) --- cmake/Platform/Arduino.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/Platform/Arduino.cmake b/cmake/Platform/Arduino.cmake index 042a3c1..edccac0 100644 --- a/cmake/Platform/Arduino.cmake +++ b/cmake/Platform/Arduino.cmake @@ -2136,6 +2136,7 @@ set(ARDUINO_AVRDUDE_FLAGS -V CACHE STRING "") #=============================================================================# if(NOT ARDUINO_FOUND AND ARDUINO_SDK_PATH) register_hardware_platform(${ARDUINO_SDK_PATH}/hardware/arduino/) + register_hardware_platform(${ARDUINO_SDK_PATH}/hardware/arduino/avr) find_file(ARDUINO_LIBRARIES_PATH NAMES libraries From 797bb764fe875b6f9ff185a6c2a410f9fa60f352 Mon Sep 17 00:00:00 2001 From: Lucas Baudin Date: Thu, 15 Oct 2015 20:20:36 +0200 Subject: [PATCH 2/2] Add a library path that was added in a recent arduino release --- cmake/Platform/Arduino.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmake/Platform/Arduino.cmake b/cmake/Platform/Arduino.cmake index edccac0..af31b8e 100644 --- a/cmake/Platform/Arduino.cmake +++ b/cmake/Platform/Arduino.cmake @@ -2138,10 +2138,18 @@ if(NOT ARDUINO_FOUND AND ARDUINO_SDK_PATH) register_hardware_platform(${ARDUINO_SDK_PATH}/hardware/arduino/) register_hardware_platform(${ARDUINO_SDK_PATH}/hardware/arduino/avr) - find_file(ARDUINO_LIBRARIES_PATH + find_file(ARDUINO_LIBRARIES_PATH_DEF NAMES libraries PATHS ${ARDUINO_SDK_PATH} - DOC "Path to directory containing the Arduino libraries.") + DOC "Path to directory containing the Arduino (default) libraries.") + + find_file(ARDUINO_LIBRARIES_PATH_PLATFORM + NAMES libraries + PATHS ${ARDUINO_SDK_PATH}/hardware/arduino/avr/ + DOC "Path to directory containing the Arduino (plateform specific) libraries.") + + set (ARDUINO_LIBRARIES_PATH "${ARDUINO_LIBRARIES_PATH_DEF};${ARDUINO_LIBRARIES_PATH_PLATFORM}" + CACHE STRING "Path to directory containing the Arduino (default) libraries.") find_file(ARDUINO_VERSION_PATH NAMES lib/version.txt