From fb37014b655901f276dec59bb225d2ade4d33901 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 9 Jan 2023 15:19:15 +0100 Subject: [PATCH] make proprietary library --- CMakeLists.txt | 13 +++++-------- linux/CMakeLists.txt | 6 +++++- linux/devices/CMakeLists.txt | 6 +++++- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d87c2695..92c239e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -402,13 +402,13 @@ endif() add_subdirectory(thirdparty) if(EIVE_ADD_LINUX_FILES) - add_subdirectory(${LIB_ARCSEC_PATH}) + # add_subdirectory(${LIB_ARCSEC_PATH}) add_subdirectory(${LINUX_PATH}) endif() add_subdirectory(${BSP_PATH}) -if(UNIX) - add_subdirectory(${LIB_GOMSPACE_PATH}) +if(UNIX AND TGT_BSP MATCHES "arm/q7s") + # add_subdirectory(${LIB_GOMSPACE_PATH}) endif() add_subdirectory(${COMMON_PATH}) @@ -489,7 +489,8 @@ target_link_libraries(${LIB_DUMMIES} PUBLIC ${LIB_FSFW_NAME} ${LIB_JSON_NAME}) target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_EIVE_MISSION} ${LIB_DUMMIES}) if(TGT_BSP MATCHES "arm/q7s") - target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_GPS} ${LIB_ARCSEC}) + target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_GPS} ${LIB_ARCSEC} + ${LIB_GOMSPACE_CLIENTS}) endif() target_link_libraries(${UNITTEST_NAME} PRIVATE Catch2 ${LIB_EIVE_MISSION} @@ -499,10 +500,6 @@ if(TGT_BSP MATCHES "arm/egse") target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_ARCSEC}) endif() -if(UNIX) - target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_GOMSPACE_CLIENTS}) -endif() - if(EIVE_ADD_ETL_LIB) target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_ETL_TARGET}) endif() diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 7f6ea0bc..b500c823 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory(csp) add_subdirectory(utility) add_subdirectory(callbacks) add_subdirectory(boardtest) @@ -9,4 +8,9 @@ if(EIVE_ADD_LINUX_FSFWCONFIG) add_subdirectory(fsfwconfig) endif() +# Dependency on proprietary library +if(TGT_BSP MATCHES "arm/q7s") + add_subdirectory(csp) +endif() + target_sources(${OBSW_NAME} PUBLIC ObjectFactory.cpp scheduling.cpp) diff --git a/linux/devices/CMakeLists.txt b/linux/devices/CMakeLists.txt index de0ea1da..a6a909d0 100644 --- a/linux/devices/CMakeLists.txt +++ b/linux/devices/CMakeLists.txt @@ -7,4 +7,8 @@ target_sources( ScexDleParser.cpp ScexHelper.cpp) add_subdirectory(ploc) -add_subdirectory(startracker) + +# Dependency on proprietary library +if(TGT_BSP MATCHES "arm/q7s") + add_subdirectory(startracker) +endif()