Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #55, Moves interface definition files to inc #56

Merged
merged 1 commit into from
Dec 22, 2022
Merged

Fix #55, Moves interface definition files to inc #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
project(CFS_CS C)

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

set(APP_SRC_FILES
fsw/src/cs_cmds.c
fsw/src/cs_table_processing.c
Expand All @@ -20,6 +16,9 @@ set(APP_SRC_FILES
# Create the app module
add_cfe_app(cs ${APP_SRC_FILES})

# This permits direct access to public headers in the fsw/inc directory
target_include_directories(cs PUBLIC fsw/inc)

set(APP_TABLE_FILES
fsw/tables/cs_apptbl.c
fsw/tables/cs_eepromtbl.c
Expand Down
0 fsw/src/cs_events.h → fsw/inc/cs_events.h
View file
Open in desktop
File renamed without changes.
0 fsw/mission_inc/cs_mission_cfg.h → fsw/inc/cs_mission_cfg.h
View file
Open in desktop
File renamed without changes.
0 fsw/src/cs_msg.h → fsw/inc/cs_msg.h
View file
Open in desktop
File renamed without changes.
0 fsw/src/cs_msgdefs.h → fsw/inc/cs_msgdefs.h
View file
Open in desktop
File renamed without changes.
0 fsw/platform_inc/cs_msgids.h → fsw/inc/cs_msgids.h
View file
Open in desktop
File renamed without changes.
0 fsw/mission_inc/cs_perfids.h → fsw/inc/cs_perfids.h
View file
Open in desktop
File renamed without changes.
0 fsw/platform_inc/cs_platform_cfg.h → fsw/inc/cs_platform_cfg.h
View file
Open in desktop
File renamed without changes.
0 fsw/src/cs_tbldefs.h → fsw/inc/cs_tbldefs.h
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion unit-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ add_cfe_coverage_stubs("cs_internal"
# Link with the cfe core stubs and unit test assert libs
target_link_libraries(coverage-cs_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-cs_internal-stubs PUBLIC utilities)
target_include_directories(coverage-cs_internal-stubs PUBLIC ../fsw/inc)
target_include_directories(coverage-cs_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