Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nasa/sample_app
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a410436f97e4ffdfffcc6a7eba806800f5d29671
Choose a base ref
...
head repository: nasa/sample_app
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 07eddd6bc6be7c67968ef7b118fe016d7107dafd
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 6, 2023

  1. Fix #202, update cmake recipe 

    Prefer target-scope properties over directory scope where applicable
    @jphickey
    jphickey committed Apr 6, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2bef88c View commit details

Commits on Apr 10, 2023

  1. Merge pull request #203 from jphickey/fix-202-cmake-recipe 

    Fix #202, update cmake recipe
    @dzbaker
    dzbaker committed Apr 10, 2023
    Copy the full SHA
    ab9a057 View commit details

  2. Bump to v1.3.0-rc4+dev39

    @dzbaker
    dzbaker committed Apr 10, 2023
    Copy the full SHA
    07eddd6 View commit details
Showing with 11 additions and 5 deletions.
  1. +4 −0 CHANGELOG.md
  2. +6 −4 CMakeLists.txt
  3. +1 −1 fsw/src/sample_app_version.h
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
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
10 changes: 6 additions & 4 deletions CMakeLists.txt
View file
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)

@@ -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
2 changes: 1 addition & 1 deletion fsw/src/sample_app_version.h
View file
Original file line number Diff line number Diff line change
@@ -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 */