From 084d511b117cbedaccc7237308108c9ae29ac93c Mon Sep 17 00:00:00 2001 From: Mindaugas Vinkelis Date: Tue, 19 Dec 2017 08:49:43 +0200 Subject: [PATCH] fixed ARDUINO define Arduino SKD versions between 1.0.0 and 1.6.0 --- CHANGELOG.md | 8 +++++++- cmake/Platform/Core/BoardFlags/FlagsSetter.cmake | 4 +--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16b4752..75af530 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Change Log -### Version 2.0.0 (Dec 13th 2017) +# Version [2.0.1](https://github.com/arduino-cmake/arduino-cmake/compare/v2.0.0...v2.0.1) (Dec 19th 2017) + +### Bug fixes + +* fixed `-DARDUINO` define for Arduino SDK versions between 1.0.0 and 1.5.8. This bug caused to included `WProgram.h` instead of `Arduino.h` for aforementioned versions. + +# Version 2.0.0 (Dec 13th 2017) An epic version which integrates too many changes to be listed and recorded since the latest stable version, which was **1.0.0**. It has been released almost 4 years ago! diff --git a/cmake/Platform/Core/BoardFlags/FlagsSetter.cmake b/cmake/Platform/Core/BoardFlags/FlagsSetter.cmake index df05924..de0f97a 100644 --- a/cmake/Platform/Core/BoardFlags/FlagsSetter.cmake +++ b/cmake/Platform/Core/BoardFlags/FlagsSetter.cmake @@ -70,9 +70,7 @@ function(_get_normalized_sdk_version OUTPUT_VAR) # -DARDUINO format after 1.0.0 combines all 3 version parts together, # e.g. for 1.5.3 version -DARDUINO=153 set(NORMALIZED_VERSION - "${ARDUINO_SDK_VERSION_MAJOR}\ - ${ARDUINO_SDK_VERSION_MINOR}\ - ${ARDUINO_SDK_VERSION_PATCH}") + "${ARDUINO_SDK_VERSION_MAJOR}${ARDUINO_SDK_VERSION_MINOR}${ARDUINO_SDK_VERSION_PATCH}") endif () endif ()