From 85e9a0e729116524abb805aea52eb1da80c53d70 Mon Sep 17 00:00:00 2001 From: samparent97 Date: Sat, 20 Apr 2024 18:38:18 -0400 Subject: [PATCH] Remove os lib from cmake for can demo projects --- firmware/projects/DemoCanBar/platforms/raspi/CMakeLists.txt | 6 +----- .../projects/DemoCanBar/platforms/stm32f767/CMakeLists.txt | 5 ----- .../projects/DemoCanBar/platforms/windows/CMakeLists.txt | 4 ---- firmware/projects/DemoCanFoo/platforms/raspi/CMakeLists.txt | 6 +----- .../projects/DemoCanFoo/platforms/stm32f767/CMakeLists.txt | 5 ----- .../projects/DemoCanFoo/platforms/windows/CMakeLists.txt | 4 ---- 6 files changed, 2 insertions(+), 28 deletions(-) diff --git a/firmware/projects/DemoCanBar/platforms/raspi/CMakeLists.txt b/firmware/projects/DemoCanBar/platforms/raspi/CMakeLists.txt index 5373ae5c0..a6cf0527a 100644 --- a/firmware/projects/DemoCanBar/platforms/raspi/CMakeLists.txt +++ b/firmware/projects/DemoCanBar/platforms/raspi/CMakeLists.txt @@ -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) \ No newline at end of file +target_include_directories(bindings PUBLIC ${CMAKE_SOURCE_DIR}) \ No newline at end of file diff --git a/firmware/projects/DemoCanBar/platforms/stm32f767/CMakeLists.txt b/firmware/projects/DemoCanBar/platforms/stm32f767/CMakeLists.txt index 704c54f8f..733037ca7 100644 --- a/firmware/projects/DemoCanBar/platforms/stm32f767/CMakeLists.txt +++ b/firmware/projects/DemoCanBar/platforms/stm32f767/CMakeLists.txt @@ -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) - diff --git a/firmware/projects/DemoCanBar/platforms/windows/CMakeLists.txt b/firmware/projects/DemoCanBar/platforms/windows/CMakeLists.txt index 599fbf0fc..c7ebcf165 100644 --- a/firmware/projects/DemoCanBar/platforms/windows/CMakeLists.txt +++ b/firmware/projects/DemoCanBar/platforms/windows/CMakeLists.txt @@ -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) \ No newline at end of file diff --git a/firmware/projects/DemoCanFoo/platforms/raspi/CMakeLists.txt b/firmware/projects/DemoCanFoo/platforms/raspi/CMakeLists.txt index 5373ae5c0..a6cf0527a 100644 --- a/firmware/projects/DemoCanFoo/platforms/raspi/CMakeLists.txt +++ b/firmware/projects/DemoCanFoo/platforms/raspi/CMakeLists.txt @@ -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) \ No newline at end of file +target_include_directories(bindings PUBLIC ${CMAKE_SOURCE_DIR}) \ No newline at end of file diff --git a/firmware/projects/DemoCanFoo/platforms/stm32f767/CMakeLists.txt b/firmware/projects/DemoCanFoo/platforms/stm32f767/CMakeLists.txt index 704c54f8f..733037ca7 100644 --- a/firmware/projects/DemoCanFoo/platforms/stm32f767/CMakeLists.txt +++ b/firmware/projects/DemoCanFoo/platforms/stm32f767/CMakeLists.txt @@ -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) - diff --git a/firmware/projects/DemoCanFoo/platforms/windows/CMakeLists.txt b/firmware/projects/DemoCanFoo/platforms/windows/CMakeLists.txt index 599fbf0fc..c7ebcf165 100644 --- a/firmware/projects/DemoCanFoo/platforms/windows/CMakeLists.txt +++ b/firmware/projects/DemoCanFoo/platforms/windows/CMakeLists.txt @@ -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) \ No newline at end of file