Skip to content

Commit 9cca36c

Browse files
authored
Merge pull request arduino-cmake#30 from fraillt/hotfix/added_asm_compilation
added asm compilation
2 parents 266d816 + ea930e8 commit 9cca36c

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cmake_minimum_required(VERSION 2.8)
1212
#====================================================================#
1313
# Setup Project #
1414
#====================================================================#
15-
project(ArduinoExample C CXX)
15+
project(ArduinoExample C CXX ASM)
1616

1717
print_board_list()
1818
print_programmer_list()

cmake/Platform/Core/SourceFinder.cmake

+8-7
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,22 @@ function(find_sources VAR_NAME LIB_PATH RECURSE)
1515
set(FILE_SEARCH_LIST
1616
${LIB_PATH}/*.cpp
1717
${LIB_PATH}/*.c
18-
${LIB_PATH}/*.s
19-
${LIB_PATH}/*.S
2018
${LIB_PATH}/*.cc
2119
${LIB_PATH}/*.cxx
2220
${LIB_PATH}/*.h
2321
${LIB_PATH}/*.hh
24-
${LIB_PATH}/*.hxx)
22+
${LIB_PATH}/*.hxx
23+
${LIB_PATH}/*.[sS]
24+
)
2525

2626
if (RECURSE)
27-
file(GLOB_RECURSE LIB_FILES ${FILE_SEARCH_LIST})
27+
file(GLOB_RECURSE SOURCE_FILES ${FILE_SEARCH_LIST})
2828
else ()
29-
file(GLOB LIB_FILES ${FILE_SEARCH_LIST})
29+
file(GLOB SOURCE_FILES ${FILE_SEARCH_LIST})
3030
endif ()
3131

32-
if (LIB_FILES)
33-
set(${VAR_NAME} ${LIB_FILES} PARENT_SCOPE)
32+
if (SOURCE_FILES)
33+
set(${VAR_NAME} ${SOURCE_FILES} PARENT_SCOPE)
3434
endif ()
3535
endfunction()
36+

0 commit comments

Comments
 (0)