From 2bef88cafa135e10cba299509b76d1a980429ef5 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Thu, 6 Apr 2023 12:15:41 -0400 Subject: [PATCH 1/2] Fix #202, update cmake recipe Prefer target-scope properties over directory scope where applicable --- CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd1d332..f83279b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 From 07eddd6bc6be7c67968ef7b118fe016d7107dafd Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 10 Apr 2023 07:22:31 -0400 Subject: [PATCH 2/2] Bump to v1.3.0-rc4+dev39 --- CHANGELOG.md | 4 ++++ fsw/src/sample_app_version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfbc057..116c3fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Development Build: v1.3.0-rc4+dev39 +- update cmake recipe +- See + ## Development Build: v1.3.0-rc4+dev35 - Remove redundant comments - Create CHANGELOG.md diff --git a/fsw/src/sample_app_version.h b/fsw/src/sample_app_version.h index 12d75bf..a2ea178 100644 --- a/fsw/src/sample_app_version.h +++ b/fsw/src/sample_app_version.h @@ -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 */