Skip to content

Commit

Permalink
HOTFIX IC 2021-04-20: always build cfe_assert
Browse files Browse the repository at this point in the history
Building "cfe_assert" does not need to be conditional on
ENABLE_UNIT_TESTS, it should be built all the time.
  • Loading branch information
jphickey committed Apr 22, 2021
1 parent 066ffff commit b8ec628
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions cmake/mission_defaults.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,13 @@ set(MISSION_MODULE_SEARCH_PATH
set(osal_SEARCH_PATH ".")
set(psp_SEARCH_PATH ".")

# If ENABLE_UNIT_TEST is enabled, then include the cfe_assert library in
# all targets. This can still be overridden in targets.cmake.
# Include "cfe_assert" library in all builds, because it is included
# in the default startup script. It should not have any effect if not
# used.
list(APPEND MISSION_GLOBAL_APPLIST cfe_assert)

# If ENABLE_UNIT_TEST is enabled, then include the cfe_testcase app
if (ENABLE_UNIT_TESTS)
list(APPEND MISSION_GLOBAL_APPLIST cfe_assert cfe_testcase)
list(APPEND MISSION_GLOBAL_APPLIST cfe_testcase)
endif (ENABLE_UNIT_TESTS)

0 comments on commit b8ec628

Please sign in to comment.