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

sch_lab Integration candidate: Caelum-rc4+dev45 #137

Merged
merged 3 commits into from
Apr 12, 2023
Merged

sch_lab Integration candidate: Caelum-rc4+dev45 #137

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
a290350
Fix #135, update cmake recipe
jphickey Apr 6, 2023
161dd27
Merge pull request #136 from jphickey/fix-135-cmake-recipe
dzbaker Apr 10, 2023
a3d7973
Bump to v2.5.0-rc4+dev49
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: 2.5.0-rc4+dev49
- update cmake recipe
- See <https://github.com/nasa/sch_lab/pull/136>

## Development Build: 2.5.0-rc4+dev45
- Remove redundant comments
- See <https://github.com/nasa/sch_lab/pull/126>
Expand Down
20 changes: 14 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
cmake_minimum_required(VERSION 3.5)
project(CFS_SCH_LAB C)

include_directories(fsw/mission_inc)
include_directories(fsw/platform_inc)
include_directories(${ci_lab_MISSION_DIR}/fsw/platform_inc)
include_directories(${to_lab_MISSION_DIR}/fsw/platform_inc)
include_directories(${sample_app_MISSION_DIR}/fsw/platform_inc)
# These references are specifically needed for the table build
# it is easiest to add them as directory properties so they won't
# be considered include directories for SCH_LAB itself.
include_directories(
$<TARGET_PROPERTY:ci_lab,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:to_lab,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:sample_app,INTERFACE_INCLUDE_DIRECTORIES>
)

# Create the app module
add_cfe_app(sch_lab fsw/src/sch_lab_app.c)
add_cfe_tables(sch_lab_table fsw/tables/sch_lab_table.c)
add_cfe_tables(sch_lab fsw/tables/sch_lab_table.c)

target_include_directories(sch_lab PUBLIC
fsw/mission_inc
fsw/platform_inc
)
2 changes: 1 addition & 1 deletion fsw/src/sch_lab_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*/

/* Development Build Macro Definitions */
#define SCH_LAB_BUILD_NUMBER 45 /*!< Development Build: Number of commits since baseline */
#define SCH_LAB_BUILD_NUMBER 49 /*!< Development Build: Number of commits since baseline */
#define SCH_LAB_BUILD_BASELINE \
"v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */

Expand Down