Skip to content

Fixed compile options polluting project #694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 15, 2023
Merged

Fixed compile options polluting project #694

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
93fca5e
Fixed compile options polluting project
MrJake222 Jun 22, 2023
a34bb0a
Apply suggestions from code review
MrJake222 Jul 1, 2023
31d0c74
fixed cmakelists keeping in mind the suggestions
MrJake222 Jul 1, 2023
1ed1f15
Merge branch 'main' into compiler-options-fix
aggarg Jul 3, 2023
a5c8028
Merge branch 'main' into compiler-options-fix
AniruddhaKanhere Jul 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,9 @@ elseif((FREERTOS_PORT STREQUAL "A_CUSTOM_PORT") AND (NOT TARGET freertos_kernel_
" freertos_kernel_include)")
endif()


add_library(freertos_kernel STATIC)

########################################################################
# Overall Compile Options
# Note the compile option strategy is to error on everything and then
Expand All @@ -248,7 +251,7 @@ endif()
# MSVC | MSVC # Note only for MinGW?
# Renesas | ?TBD?

add_compile_options(
target_compile_options(freertos_kernel PRIVATE
### Gnu/Clang C Options
$<$<COMPILE_LANG_AND_ID:C,GNU>:-fdiagnostics-color=always>
$<$<COMPILE_LANG_AND_ID:C,Clang>:-fcolor-diagnostics>
Expand All @@ -267,7 +270,7 @@ add_compile_options(
add_subdirectory(include)
add_subdirectory(portable)

add_library(freertos_kernel STATIC
target_sources(freertos_kernel PRIVATE
croutine.c
event_groups.c
list.c
Expand All @@ -280,6 +283,7 @@ add_library(freertos_kernel STATIC
$<IF:$<BOOL:$<FILTER:${FREERTOS_HEAP},EXCLUDE,^[1-5]$>>,${FREERTOS_HEAP},portable/MemMang/heap_${FREERTOS_HEAP}.c>
)


target_link_libraries(freertos_kernel
PUBLIC
freertos_kernel_port
Expand Down