Skip to content

Commit a3c2236

Browse files
Fixes bug arduino-cmake#39 (Compilation error when no sketch specified, extra -I flag)
1 parent a2175e8 commit a3c2236

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

cmake/Platform/Arduino.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,18 +291,19 @@ function(GENERATE_ARDUINO_FIRMWARE INPUT_NAME)
291291

292292
set(ALL_LIBS)
293293
set(ALL_SRCS ${INPUT_SRCS} ${INPUT_HDRS})
294+
set(LIB_DEP_INCLUDES)
294295

295296
setup_arduino_core(CORE_LIB ${INPUT_BOARD})
296297

297298
if(NOT "${INPUT_SKETCH}" STREQUAL "")
298299
get_filename_component(INPUT_SKETCH "${INPUT_SKETCH}" ABSOLUTE)
299300
setup_arduino_sketch(${INPUT_NAME} ${INPUT_SKETCH} ALL_SRCS)
301+
set(LIB_DEP_INCLUDES "${LIB_DEP_INCLUDES} -I${INPUT_SKETCH}")
300302
endif()
301303

302304
required_variables(VARS ALL_SRCS MSG "must define SRCS or SKETCH for target ${INPUT_NAME}")
303305

304306
find_arduino_libraries(TARGET_LIBS "${ALL_SRCS}")
305-
set(LIB_DEP_INCLUDES)
306307
foreach(LIB_DEP ${TARGET_LIBS})
307308
set(LIB_DEP_INCLUDES "${LIB_DEP_INCLUDES} -I${LIB_DEP}")
308309
endforeach()
@@ -313,7 +314,7 @@ function(GENERATE_ARDUINO_FIRMWARE INPUT_NAME)
313314

314315
list(APPEND ALL_LIBS ${CORE_LIB} ${INPUT_LIBS})
315316

316-
setup_arduino_target(${INPUT_NAME} ${INPUT_BOARD} "${ALL_SRCS}" "${ALL_LIBS}" "-I${INPUT_SKETCH} ${LIB_DEP_INCLUDES}" "")
317+
setup_arduino_target(${INPUT_NAME} ${INPUT_BOARD} "${ALL_SRCS}" "${ALL_LIBS}" "${LIB_DEP_INCLUDES}" "")
317318

318319
if(INPUT_PORT)
319320
setup_arduino_upload(${INPUT_BOARD} ${INPUT_NAME} ${INPUT_PORT} "${INPUT_PROGRAMMER}" "${INPUT_AFLAGS}")

example/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ generate_arduino_library(blink_lib
7474
#====================================================================#
7575
generate_arduino_firmware(blink
7676
SRCS blink.cpp
77-
LIBS blink_lib)
77+
LIBS blink_lib
78+
BOARD uno)
7879

7980
# Alternative: by variables
8081
#set(blink_SRCS blink.cpp)

0 commit comments

Comments
 (0)