diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b8190ec..e8efc3fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -367,7 +367,11 @@ if(EIVE_ADD_LINUX_FILES) add_subdirectory(${LINUX_PATH}) endif() add_subdirectory(${BSP_PATH}) -add_subdirectory(${LIB_GOMSPACE_PATH}) + +if(UNIX) + add_subdirectory(${LIB_GOMSPACE_PATH}) +endif() + add_subdirectory(${COMMON_PATH}) add_subdirectory(${DUMMY_PATH}) @@ -452,16 +456,15 @@ if(TGT_BSP MATCHES "arm/q7s") endif() target_link_libraries( - ${UNITTEST_NAME} PRIVATE Catch2 ${LIB_EIVE_MISSION} rapidcsv ${LIB_DUMMIES} - ${LIB_GOMSPACE_CLIENTS}) + ${UNITTEST_NAME} PRIVATE Catch2 ${LIB_EIVE_MISSION} rapidcsv ${LIB_DUMMIES}) if(TGT_BSP MATCHES "arm/egse") target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_ARCSEC}) endif() -target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_GOMSPACE_CLIENTS}) -target_link_libraries(${LIB_EIVE_MISSION} PRIVATE ${LIB_GOMSPACE_CLIENTS}) -target_link_libraries(${LIB_DUMMIES} PRIVATE ${LIB_GOMSPACE_CLIENTS}) +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}) diff --git a/fsfw b/fsfw index 79ab0c4a..9927dbb2 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 79ab0c4aa5f2c6441f97640301cba48052294581 +Subproject commit 9927dbb2e47d9f7a54f4e386a0e1f41b84ff2e0e diff --git a/misc/eclipse/.cproject b/misc/eclipse/.cproject index 9bb5f401..082b64f2 100644 --- a/misc/eclipse/.cproject +++ b/misc/eclipse/.cproject @@ -19,7 +19,7 @@ - +