eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

mueller/master #37

Closed
muellerr wants to merge 126 commits from mueller/master into eive/develop
pull from: mueller/master
merge into: eive:eive/develop
Conversation 0 Commits 126 Files Changed 42 +1451 -5443
146 changed files with 1451 additions and 5443 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d0b7a1ecf2 - Show all commits

34
tests/src/fsfw_tests/unit/testcfg/CMakeLists.txt
View File

@@ -1,12 +1,12 @@
target_sources(${FSFW_TEST_TGT} PRIVATE #target_sources(${FSFW_TEST_TGT} PRIVATE
ipc/MissionMessageTypes.cpp # ipc/MissionMessageTypes.cpp
pollingsequence/PollingSequenceFactory.cpp # pollingsequence/PollingSequenceFactory.cpp
) #)
# Add include paths for the executable # Add include paths for the executable
target_include_directories(${FSFW_TEST_TGT} PRIVATE #target_include_directories(${FSFW_TEST_TGT} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR} # ${CMAKE_CURRENT_SOURCE_DIR}
) #)
# These translation files are actually not that relevant for the tests. However, the FSFW tests # These translation files are actually not that relevant for the tests. However, the FSFW tests
# compile against a user-configured variant of the FSFW, which might be configured to include # compile against a user-configured variant of the FSFW, which might be configured to include
@@ -14,15 +14,15 @@ target_include_directories(${FSFW_TEST_TGT} PRIVATE
# so the tests compile in any case. # so the tests compile in any case.
# If a special translation file for object IDs exists, compile it. # If a special translation file for object IDs exists, compile it.
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp") #if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp")
target_sources(${FSFW_TEST_TGT} PRIVATE # target_sources(${FSFW_TEST_TGT} PRIVATE
objects/translateObjects.cpp # objects/translateObjects.cpp
) # )
endif() #endif()
# If a special translation file for events exists, compile it. # If a special translation file for events exists, compile it.
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp") #if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp")
target_sources(${FSFW_TEST_TGT} PRIVATE # target_sources(${FSFW_TEST_TGT} PRIVATE
events/translateEvents.cpp # events/translateEvents.cpp
) # )
endif() #endif()