Skip to content

Commit 57ca78f

Browse files
author
mean
committed
simplify generate_library to avoid creating hierarchy between objects and targets
1 parent 4d7d3cb commit 57ca78f

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

Platform/Generation/ArduinoLibraryGenerator.cmake

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# see documentation at README
55
#=============================================================================#
66
function(generate_arduino_library INPUT_NAME)
7-
message(STATUS "Generating ${INPUT_NAME}")
7+
message(STATUS "Generating Library ${INPUT_NAME}")
88
parse_generator_arguments(${INPUT_NAME} INPUT
99
"NO_AUTOLIBS;MANUAL" # Options
1010
"BOARD;BOARD_CPU" # One Value Keywords
@@ -27,29 +27,21 @@ function(generate_arduino_library INPUT_NAME)
2727
set(ALL_LIBS)
2828
set(ALL_SRCS ${INPUT_SRCS} ${INPUT_HDRS})
2929

30-
if (NOT INPUT_MANUAL)
31-
make_core_library(CORE_LIB ${BOARD_ID})
32-
endif ()
3330

3431
find_arduino_libraries(TARGET_LIBS "${ALL_SRCS}" "")
3532
set(LIB_DEP_INCLUDES)
3633
foreach (LIB_DEP ${TARGET_LIBS})
37-
set(LIB_DEP_INCLUDES "${LIB_DEP_INCLUDES} -I\"${LIB_DEP}\"")
34+
LIST(APPEND LIB_DEP_INCLUDES ${LIB_DEP})
3835
endforeach ()
3936

40-
if (NOT ${INPUT_NO_AUTOLIBS})
41-
make_arduino_libraries(ALL_LIBS ${BOARD_ID} "" "${LIB_DEP_INCLUDES}" "")
42-
endif ()
43-
4437
list(APPEND ALL_LIBS ${CORE_LIB} ${INPUT_LIBS})
4538

4639
add_library(${INPUT_NAME} ${ALL_SRCS})
4740

4841
set_board_flags(ARDUINO_COMPILE_FLAGS ARDUINO_LINK_FLAGS ${BOARD_ID} ${INPUT_MANUAL})
4942

50-
set_target_properties(${INPUT_NAME} PROPERTIES
51-
COMPILE_FLAGS "${ARDUINO_COMPILE_FLAGS} ${COMPILE_FLAGS} ${LIB_DEP_INCLUDES}"
52-
LINK_FLAGS "${ARDUINO_LINK_FLAGS} ${LINK_FLAGS}")
53-
54-
target_link_libraries(${INPUT_NAME} ${ALL_LIBS} "-lc -lm")
43+
separate_arguments(my_ARDUINO_COMPILE_FLAGS UNIX_COMMAND "${ARDUINO_COMPILE_FLAGS}")
44+
target_compile_options( ${INPUT_NAME} PRIVATE ${my_ARDUINO_COMPILE_FLAGS} )
45+
target_compile_options( ${INPUT_NAME} PRIVATE ${COMPILE_FLAGS} )
46+
target_include_directories(${INPUT_NAME} PUBLIC ${LIB_DEP_INCLUDES})
5547
endfunction()

0 commit comments

Comments
 (0)