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

sample_app Integration candidate: Caelum-rc4+dev45 #204

Merged
merged 3 commits into from
Apr 12, 2023
Merged

sample_app Integration candidate: Caelum-rc4+dev45 #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bef88c
Fix #202, update cmake recipe
jphickey Apr 6, 2023
ab9a057
Merge pull request #203 from jphickey/fix-202-cmake-recipe
dzbaker Apr 10, 2023
07eddd6
Bump to v1.3.0-rc4+dev39
dzbaker Apr 10, 2023
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Development Build: v1.3.0-rc4+dev39
- update cmake recipe
- See <https://github.com/nasa/sample_app/pull/203>

## Development Build: v1.3.0-rc4+dev35
- Remove redundant comments
- Create CHANGELOG.md
Expand Down
10 changes: 6 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
project(CFE_SAMPLE_APP C)

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

# Create the app module
add_cfe_app(sample_app fsw/src/sample_app.c)

Expand All @@ -11,7 +8,12 @@ add_cfe_app(sample_app fsw/src/sample_app.c)
add_cfe_app_dependency(sample_app sample_lib)

# Add table
add_cfe_tables(sampleAppTable fsw/tables/sample_app_tbl.c)
add_cfe_tables(sample_app fsw/tables/sample_app_tbl.c)

target_include_directories(sample_app PUBLIC
fsw/mission_inc
fsw/platform_inc
)

# If UT is enabled, then add the tests from the subdirectory
# Note that this is an app, and therefore does not provide
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/sample_app_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

/* Development Build Macro Definitions */

#define SAMPLE_APP_BUILD_NUMBER 35 /*!< Development Build: Number of commits since baseline */
#define SAMPLE_APP_BUILD_NUMBER 39 /*!< Development Build: Number of commits since baseline */
#define SAMPLE_APP_BUILD_BASELINE \
"v1.3.0-rc4" /*!< Development Build: git tag that is the base for the current development */

Expand Down