Skip to content

Commit

Permalink
Remove os lib from cmake for can demo projects
Browse files Browse the repository at this point in the history
  • Loading branch information
samparent97 committed Apr 20, 2024
1 parent 4be595f commit 85e9a0e
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 28 deletions.
6 changes: 1 addition & 5 deletions firmware/projects/DemoCanBar/platforms/raspi/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,4 @@ target_sources(bindings
bindings.cc
)

target_include_directories(bindings PUBLIC ${CMAKE_SOURCE_DIR})

add_library(os)
target_sources(os PUBLIC ${CMAKE_SOURCE_DIR}/mcal/raspi/os/tick_blocking.cc)
target_link_libraries(os PUBLIC mcal-raspi)
target_include_directories(bindings PUBLIC ${CMAKE_SOURCE_DIR})
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,3 @@ add_subdirectory(cubemx)
target_include_directories(bindings PUBLIC ${CMAKE_SOURCE_DIR}/mcal/os)
target_sources(bindings PUBLIC bindings.cc)
target_link_libraries(bindings PUBLIC driver mcal-stm32f767)

add_library(os)
target_sources(os PUBLIC ${CMAKE_SOURCE_DIR}/mcal/stm32f767/os/tick_blocking.cc)
target_link_libraries(os PUBLIC driver mcal-stm32f767)

4 changes: 0 additions & 4 deletions firmware/projects/DemoCanBar/platforms/windows/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,3 @@ PRIVATE
)

target_link_libraries(bindings PUBLIC mcal-windows)

add_library(os)
target_sources(os PUBLIC ${CMAKE_SOURCE_DIR}/mcal/windows/os/tick_blocking.cc)
target_link_libraries(os PUBLIC mcal-windows)
6 changes: 1 addition & 5 deletions firmware/projects/DemoCanFoo/platforms/raspi/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,4 @@ target_sources(bindings
bindings.cc
)

target_include_directories(bindings PUBLIC ${CMAKE_SOURCE_DIR})

add_library(os)
target_sources(os PUBLIC ${CMAKE_SOURCE_DIR}/mcal/raspi/os/tick_blocking.cc)
target_link_libraries(os PUBLIC mcal-raspi)
target_include_directories(bindings PUBLIC ${CMAKE_SOURCE_DIR})
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,3 @@ add_subdirectory(cubemx)
target_include_directories(bindings PUBLIC ${CMAKE_SOURCE_DIR}/mcal/os)
target_sources(bindings PUBLIC bindings.cc)
target_link_libraries(bindings PUBLIC driver mcal-stm32f767)

add_library(os)
target_sources(os PUBLIC ${CMAKE_SOURCE_DIR}/mcal/stm32f767/os/tick_blocking.cc)
target_link_libraries(os PUBLIC driver mcal-stm32f767)

4 changes: 0 additions & 4 deletions firmware/projects/DemoCanFoo/platforms/windows/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,3 @@ PRIVATE
)

target_link_libraries(bindings PUBLIC mcal-windows)

add_library(os)
target_sources(os PUBLIC ${CMAKE_SOURCE_DIR}/mcal/windows/os/tick_blocking.cc)
target_link_libraries(os PUBLIC mcal-windows)

0 comments on commit 85e9a0e

Please sign in to comment.