Skip to content

Commit

Permalink
Fix #67, Moves interface definition files to inc
Browse files Browse the repository at this point in the history
  • Loading branch information
chillfig committed Dec 6, 2022
1 parent c4063cc commit 4279323
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 5 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
project(CFS_FM C)

include_directories(fsw/src)
include_directories(fsw/mission_inc)
include_directories(fsw/platform_inc)

# Uncomment the below include if decompress functionality is
# enabled in FM
# include_directories(${fs_lib_MISSION_DIR}/fsw/public_inc)
Expand All @@ -19,6 +15,10 @@ set(APP_SRC_FILES
# Create the app module
add_cfe_app(fm ${APP_SRC_FILES})

# This permits direct access to public headers in the fsw/inc and fsw/src directories
target_include_directories(fm PUBLIC fsw/inc)
target_include_directories(fm PUBLIC fsw/src)

set(APP_TABLE_FILES
fsw/tables/fm_monitor.c
)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 3 additions & 1 deletion unit-test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ add_cfe_coverage_stubs("fm_internal"
# Link with the cfe core stubs and unit test assert libs
target_link_libraries(coverage-fm_internal-stubs ut_core_api_stubs ut_assert)

# Include and expose unit test utilities includes
# Include and expose unit test utilities, fsw/inc, and fsw/src includes
target_include_directories(coverage-fm_internal-stubs PUBLIC utilities)
target_include_directories(coverage-fm_internal-stubs PUBLIC ../fsw/inc)
target_include_directories(coverage-fm_internal-stubs PUBLIC ../fsw/src)

# Generate a dedicated "testrunner" executable for each test file
# Accomplish this by cycling through all the app's source files, there must be
Expand Down

0 comments on commit 4279323

Please sign in to comment.