From ea930e828cf4107a45d08a494cf635a38ceca764 Mon Sep 17 00:00:00 2001 From: Mindaugas Vinkelis Date: Fri, 8 Dec 2017 07:24:43 +0200 Subject: [PATCH] added ASM to project, to compile core library assembly files. --- CMakeLists.txt | 2 +- cmake/Platform/Core/SourceFinder.cmake | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 755e3d2..f76fc3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ cmake_minimum_required(VERSION 2.8) #====================================================================# # Setup Project # #====================================================================# -project(ArduinoExample C CXX) +project(ArduinoExample C CXX ASM) print_board_list() print_programmer_list() diff --git a/cmake/Platform/Core/SourceFinder.cmake b/cmake/Platform/Core/SourceFinder.cmake index c75adcf..cb89aab 100644 --- a/cmake/Platform/Core/SourceFinder.cmake +++ b/cmake/Platform/Core/SourceFinder.cmake @@ -15,21 +15,22 @@ function(find_sources VAR_NAME LIB_PATH RECURSE) set(FILE_SEARCH_LIST ${LIB_PATH}/*.cpp ${LIB_PATH}/*.c - ${LIB_PATH}/*.s - ${LIB_PATH}/*.S ${LIB_PATH}/*.cc ${LIB_PATH}/*.cxx ${LIB_PATH}/*.h ${LIB_PATH}/*.hh - ${LIB_PATH}/*.hxx) + ${LIB_PATH}/*.hxx + ${LIB_PATH}/*.[sS] + ) if (RECURSE) - file(GLOB_RECURSE LIB_FILES ${FILE_SEARCH_LIST}) + file(GLOB_RECURSE SOURCE_FILES ${FILE_SEARCH_LIST}) else () - file(GLOB LIB_FILES ${FILE_SEARCH_LIST}) + file(GLOB SOURCE_FILES ${FILE_SEARCH_LIST}) endif () - if (LIB_FILES) - set(${VAR_NAME} ${LIB_FILES} PARENT_SCOPE) + if (SOURCE_FILES) + set(${VAR_NAME} ${SOURCE_FILES} PARENT_SCOPE) endif () endfunction() +