Skip to content

Commit

Permalink
Update Arduino CMake
Browse files Browse the repository at this point in the history
Prior to this commit oscc used a no longer supported Arduino CMake based
toolchain. This commit fixes that by updating the toolchain to use the
arduino-cmake files.
  • Loading branch information
rebpdx committed May 24, 2018
1 parent 887356f commit 8f0d547
Show file tree
Hide file tree
Showing 51 changed files with 3,988 additions and 2,263 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
**/tests/**/Cargo.lock
**/tests/**/common/
**/tests/**/target/

#cucumber port
cucumber.wire
101 changes: 56 additions & 45 deletions firmware/common/toolchain/ArduinoToolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,78 +6,89 @@
# 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/.
#=============================================================================#
if (_IS_TOOLCHAIN_PROCESSED)
return()
endif ()
set(_IS_TOOLCHAIN_PROCESSED True)

set(CMAKE_SYSTEM_NAME Arduino)

set(CMAKE_C_COMPILER avr-gcc)
set(CMAKE_C_COMPILER avr-gcc)
set(CMAKE_ASM_COMPILER avr-gcc)
set(CMAKE_CXX_COMPILER avr-g++)

# Add current directory to CMake Module path automatically
if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/Platform/Arduino.cmake)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR})
endif()
if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/Platform/Arduino.cmake)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR})
endif ()

#=============================================================================#
# System Paths #
#=============================================================================#
if(UNIX)
if (UNIX)
include(Platform/UnixPaths)
if(APPLE)
if (APPLE)
list(APPEND CMAKE_SYSTEM_PREFIX_PATH ~/Applications
/Applications
/Developer/Applications
/sw # Fink
/opt/local) # MacPorts
endif()
elseif(WIN32)
/Applications
/Developer/Applications
/sw # Fink
/opt/local) # MacPorts
endif ()
elseif (WIN32)
include(Platform/WindowsPaths)
endif()

endif ()

#=============================================================================#
# Detect Arduino SDK #
#=============================================================================#
if(NOT ARDUINO_SDK_PATH)
if ((NOT ARDUINO_SDK_PATH) AND (NOT DEFINED ENV{_ARDUINO_CMAKE_WORKAROUND_ARDUINO_SDK_PATH}))
set(ARDUINO_PATHS)

foreach(DETECT_VERSION_MAJOR 1)
foreach(DETECT_VERSION_MINOR RANGE 5 0)
foreach (DETECT_VERSION_MAJOR 1)
foreach (DETECT_VERSION_MINOR RANGE 5 0)
list(APPEND ARDUINO_PATHS arduino-${DETECT_VERSION_MAJOR}.${DETECT_VERSION_MINOR})
foreach(DETECT_VERSION_PATCH RANGE 3 0)
foreach (DETECT_VERSION_PATCH RANGE 3 0)
list(APPEND ARDUINO_PATHS arduino-${DETECT_VERSION_MAJOR}.${DETECT_VERSION_MINOR}.${DETECT_VERSION_PATCH})
endforeach()
endforeach()
endforeach()
endforeach ()
endforeach ()
endforeach ()

foreach(VERSION RANGE 23 19)
foreach (VERSION RANGE 23 19)
list(APPEND ARDUINO_PATHS arduino-00${VERSION})
endforeach()
endforeach ()

if(UNIX)
file(GLOB SDK_PATH_HINTS /usr/share/arduino*
/opt/local/arduino*
/opt/arduino*
/usr/local/share/arduino*)
elseif(WIN32)
set(SDK_PATH_HINTS "C:\\Program Files\\Arduino"
"C:\\Program Files (x86)\\Arduino"
)
endif()
if (UNIX)
file(GLOB SDK_PATH_HINTS
/usr/share/arduino*
/opt/local/arduino*
/opt/arduino*
/usr/local/share/arduino*)
elseif (WIN32)
set(SDK_PATH_HINTS
"C:\\Program Files\\Arduino"
"C:\\Program Files (x86)\\Arduino")
endif ()
list(SORT SDK_PATH_HINTS)
list(REVERSE SDK_PATH_HINTS)
endif()

find_path(ARDUINO_SDK_PATH
NAMES lib/version.txt
PATH_SUFFIXES share/arduino
Arduino.app/Contents/Resources/Java/
${ARDUINO_PATHS}
HINTS ${SDK_PATH_HINTS}
DOC "Arduino SDK path.")
if (DEFINED ENV{ARDUINO_SDK_PATH})
list(APPEND SDK_PATH_HINTS $ENV{ARDUINO_SDK_PATH})
endif ()

find_path(ARDUINO_SDK_PATH
NAMES lib/version.txt
PATH_SUFFIXES share/arduino Arduino.app/Contents/Resources/Java/ Arduino.app/Contents/Java/ ${ARDUINO_PATHS}
HINTS ${SDK_PATH_HINTS}
DOC "Arduino SDK base directory")
elseif ((NOT ARDUINO_SDK_PATH) AND (DEFINED ENV{_ARDUINO_CMAKE_WORKAROUND_ARDUINO_SDK_PATH}))
set(ARDUINO_SDK_PATH "$ENV{_ARDUINO_CMAKE_WORKAROUND_ARDUINO_SDK_PATH}")
endif ()

if (ARDUINO_SDK_PATH)
set(ENV{_ARDUINO_CMAKE_WORKAROUND_ARDUINO_SDK_PATH} "${ARDUINO_SDK_PATH}")

if(ARDUINO_SDK_PATH)
list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${ARDUINO_SDK_PATH}/hardware/tools/avr)
list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${ARDUINO_SDK_PATH}/hardware/tools/avr/utils)
else()
else ()
message(FATAL_ERROR "Could not find Arduino SDK (set ARDUINO_SDK_PATH)!")
endif()

endif ()
Loading

0 comments on commit 8f0d547

Please sign in to comment.