bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix and improve Makefile / CMake (#19640)

Browse Source
This commit is contained in:
Samantaz Fox
2020-10-09 01:40:54 +02:00
committed by Scott Lahteine
parent d66bc5cec2
commit b8700e0aa8
2 changed files with 133 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
buildroot/share/cmake/CMakeLists.txt
View File

@@ -47,8 +47,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/marlin-cma
# cmake .. -DARDUINO_SDK_PATH="/path/to/arduino-1.x.x" #
#====================================================================#
#set(ARDUINO_SDK_PATH ${CMAKE_CURRENT_LIST_DIR}/arduino-1.6.8)
#set(ARDUINO_SDK_PATH /home/tom/git/BigBox-Dual-Marlin/ArduinoAddons/Arduino_1.6.x)
#set(ARDUINO_SDK_PATH /home/tom/test/arduino-1.6.11)
#set(ARDUINO_SDK_PATH /Applications/Arduino.app/Contents/Java)
#set(ARDUINO_SDK_PATH $HOME/ArduinoAddons/Arduino_1.6.x)
#====================================================================#
# Set included cmake files #
#====================================================================#
@@ -96,8 +96,8 @@ setup_motherboard(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/../../../Marlin)
# Include Marlin.ino to compile libs not included in *.cpp files #
#====================================================================#
file(GLOB SOURCES "../../../src/*.cpp")
set(${PROJECT_NAME}_SRCS "${SOURCES};../../../src/Marlin.ino")
file(GLOB_RECURSE SOURCES "../../../Marlin/*.cpp")
set(${PROJECT_NAME}_SRCS "${SOURCES};../../../Marlin/Marlin.ino")
#====================================================================#
# Define the port for uploading code to the Arduino #