Fix #84, split configuration #87
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jphickey
force-pushed
the
fix-84-splitcfg
branch
2 times, most recently
from
4f8268a
to
d820730
Compare
Move configuration include files to a separate "config" subdirectory, and use the "generate_config_includefile" cmake function to select the one to use and create a wrapper. This makes it easier to override the file and/or use a generated file in place of the distribution/default copy.
jphickey
force-pushed
the
fix-84-splitcfg
branch
from
d820730
to
5ed1fe3
Compare
skliper
reviewed
Apr 6, 2023
| # This makes them individually overridable by the missions, without modifying | ||
| # the distribution default copies | ||
| foreach(HS_CFGFILE ${HS_PLATFORM_CONFIG_FILE_LIST}) | ||
| set(DEFAULT_SOURCE "${CMAKE_CURRENT_LIST_DIR}/config/default_${HS_CFGFILE}") |
There was a problem hiding this comment.
Consider consolidating the target_defs search patterns.
Tables has: https://github.com/nasa/cFE/blob/7af467efdc15f788d44d67cb807403b10c4f0c99/cmake/arch_build.cmake#L187-L201.
Then there's the file list:
https://github.com/nasa/cFE/blob/7af467efdc15f788d44d67cb807403b10c4f0c99/cmake/arch_build.cmake#L703-L712
Maybe there's more? Would be nice if the search logic was intuitive, consistent, and well documented.
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist (Please check before submitting)
Describe the contribution
Move configuration include files to a separate "config" subdirectory, and use the "generate_config_includefile" cmake function to select the one to use and create a wrapper.
This makes it easier to override the file and/or use a generated file in place of the distribution/default copy.
Fixes #84
Testing performed
Build and run HS and all tests, sanity check operation
Expected behavior changes
None
System(s) tested on
Debian
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.