Skip to content

Commit

Permalink
Fix #718, add user-specified extra modules to build
Browse files Browse the repository at this point in the history
Add a new setting that can be set in targets.cmake, to
enable users to add extra custom functions/modules to
CFE core itself.

This can be used, among other things, for future support
of a modular/customizable message header structure.
  • Loading branch information
jphickey committed Jun 2, 2020
1 parent d217ca3 commit a921046
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion cmake/mission_build.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ function(prepare)
# so this is run in a loop until the list of unfound apps is empty
string(REPLACE ":" ";" CFS_APP_PATH "$ENV{CFS_APP_PATH}")
list(APPEND CFS_APP_PATH "apps" "apps/CFS" "libs" "psp/fsw/modules")
set(MISSION_DEPS "cfe-core" "osal")
set(MISSION_DEPS "cfe-core" "osal" ${MISSION_CORE_MODULES})
set(APP_MISSING_COUNT 0)

# Set the search path of those dependency components which are fixed
Expand Down
1 change: 1 addition & 0 deletions cmake/target/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ endif (TGT${TGTID}_APPLIST)
# This depends on whether any special features are included or not
set(CFE_LINK_WHOLE_LIBS
${CFE_CORE_TARGET}
${MISSION_CORE_MODULES}
psp-${CFE_SYSTEM_PSPNAME}
osal
)
Expand Down

0 comments on commit a921046

Please sign in to comment.