fsfw points to eive/develop now

This commit is contained in:
Robin Müller 2020-12-29 14:14:11 +01:00 committed by Robin Mueller
parent d8185c0611
commit e42cbc3116
9 changed files with 29 additions and 3 deletions

View File

@ -37,6 +37,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
# Set names and variables # Set names and variables
set(TARGET_NAME ${CMAKE_PROJECT_NAME}) set(TARGET_NAME ${CMAKE_PROJECT_NAME})
set(LIB_FSFW_NAME fsfw) set(LIB_FSFW_NAME fsfw)
set(LIB_CSP_NAME libcsp)
# Set path names # Set path names
set(FSFW_PATH fsfw) set(FSFW_PATH fsfw)
@ -91,6 +92,12 @@ target_link_libraries(${TARGET_NAME} PRIVATE
${LIB_OS_NAME} ${LIB_OS_NAME}
) )
if(ADD_CSP_LIB)
target_link_libraries(${TARGET_NAME} PRIVATE
${LIB_CSP_NAME}
)
endif()
# Add include paths for all sources. # Add include paths for all sources.
target_include_directories(${TARGET_NAME} PRIVATE target_include_directories(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}

View File

@ -5,6 +5,7 @@ target_sources(${TARGET_NAME} PUBLIC
) )
add_subdirectory(boardconfig) add_subdirectory(boardconfig)
add_subdirectory(comIF)

View File

@ -0,0 +1,8 @@
target_sources(${TARGET_NAME} PRIVATE
cookies/CspCookie.cpp
CspComIF.cpp
)

2
fsfw

@ -1 +1 @@
Subproject commit 5b9c0e013e35ab1353d402c6fa2cd75866e3afa5 Subproject commit 8ef6283bf4f5cf5d12131c48365a753825fea637

View File

@ -4,4 +4,8 @@ target_include_directories(${LIB_CSP_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/csp/crypto ${CMAKE_CURRENT_SOURCE_DIR}/csp/crypto
) )
target_include_directories(${LIB_CSP_NAME} INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
)

View File

@ -7,7 +7,7 @@ target_sources(${LIB_CSP_NAME} PRIVATE
csp_dedup.c csp_dedup.c
csp_endian.c csp_endian.c
csp_hex_dump.c csp_hex_dump.c
csp_pflist.c csp_iflist.c
csp_io.c csp_io.c
csp_port.c csp_port.c
csp_promisc.c csp_promisc.c
@ -22,4 +22,6 @@ add_subdirectory(drivers)
add_subdirectory(crypto) add_subdirectory(crypto)
add_subdirectory(interfaces) add_subdirectory(interfaces)
add_subdirectory(rtable) add_subdirectory(rtable)
add_subdirectory(transport)
add_subdirectory(arch)

View File

@ -0,0 +1,3 @@
add_subdirectory(posix)

View File

@ -1,7 +1,7 @@
target_sources(${LIB_CSP_NAME} PRIVATE target_sources(${LIB_CSP_NAME} PRIVATE
csp_malloc.c csp_malloc.c
csp_queue.c csp_queue.c
csp_sempahore.c csp_semaphore.c
csp_system.c csp_system.c
csp_thread.c csp_thread.c
csp_time.c csp_time.c

View File

@ -3,6 +3,7 @@ target_sources(${TARGET_NAME} PUBLIC
GyroL3GD20Handler.cpp GyroL3GD20Handler.cpp
MGMHandlerLIS3MDL.cpp MGMHandlerLIS3MDL.cpp
MGMHandlerRM3100.cpp MGMHandlerRM3100.cpp
GomspaceDeviceHandler.cpp
) )