Skip to content
This repository was archived by the owner on Apr 17, 2023. It is now read-only.

Commit fc33e08

Browse files
authored
Merge branch 'master' into bug/path-lib-fix
2 parents 5a4c75f + 3dbc53f commit fc33e08

File tree

3 files changed

+18
-19
lines changed

3 files changed

+18
-19
lines changed

.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,17 @@ crashlytics.properties
116116
crashlytics-build.properties
117117
fabric.properties
118118

119+
### VisualStudioCode ###
120+
.vscode/*
121+
.vscode/settings.json
122+
!.vscode/tasks.json
123+
!.vscode/launch.json
124+
!.vscode/extensions.json
125+
126+
### VisualStudioCode Patch ###
127+
# Ignore all local history of files
128+
.history
129+
119130
### User-Defined
120131
[Aa]ssets/*
121132
/examples/blink-example/Blink.cpp

.vscode/settings.json

Lines changed: 0 additions & 16 deletions
This file was deleted.

cmake/Platform/Targets/CoreLibTarget.cmake

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,17 @@ function(add_arduino_core_lib _target_name _board_id)
9494

9595
# Find sources in core directory and add the library target
9696
find_source_files("${ARDUINO_CMAKE_CORE_${board_core}_PATH}" core_sources)
97+
9798
if (${CMAKE_HOST_UNIX})
99+
98100
if (CMAKE_HOST_UBUNTU OR CMAKE_HOST_DEBIAN)
99-
set(core_sources_temp_copy ${core_sources})
100-
list(FILTER core_sources_temp_copy INCLUDE REGEX "[Mm]ain\\.c.*")
101-
message("Temp Copy: ${core_sources_temp_copy}")
101+
102+
list(FILTER core_sources EXCLUDE REGEX "[Mm]ain\\.c.*")
103+
102104
endif ()
105+
103106
endif ()
107+
104108
add_library(${core_lib_target} STATIC "${core_sources}")
105109

106110
# Include platform's core and variant directories

0 commit comments

Comments
 (0)