fixed conflicts

2022-02-25 14:39:18 +01:00
parent e082f3973a 486fa9cae2
commit e61dfc0401
62 changed files with 3851 additions and 1018 deletions
--- a/bsp_linux_board/boardconfig/CMakeLists.txt
+++ b/bsp_linux_board/boardconfig/CMakeLists.txt
@ -1,7 +1,7 @@
-target_sources(${TARGET_NAME} PRIVATE
+target_sources(${OBSW_NAME} PRIVATE
 	print.c
 )

-target_include_directories(${TARGET_NAME} PUBLIC
+target_include_directories(${OBSW_NAME} PUBLIC
 	${CMAKE_CURRENT_SOURCE_DIR}
 )