Skip to content

Commit

Permalink
Merge pull request #204 from nasa/integration-candidate
Browse files Browse the repository at this point in the history
sample_app Integration candidate: Caelum-rc4+dev45
  • Loading branch information
dzbaker authored Apr 12, 2023
2 parents a410436 + 07eddd6 commit 6794db4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
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
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
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

0 comments on commit 6794db4

Please sign in to comment.