Fix #652, cmake-based OSAL config #667
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
Rather than CFE generating an osconfig.h file directly, it just needs to select file(s) from the defs directory and pass them to OSAL for the config.
|
Note: This is a re-submission of original PR #654 which was NOT merged. |
skliper
approved these changes
May 4, 2020
astrogeco
approved these changes
May 4, 2020
astrogeco
added
the
CCB:Approved
jphickey
added a commit
that referenced
this pull request
May 4, 2020
This replaces native_osconfig.h and enables running UT as a normal user when SIMULATION=native. Travis-CI requires this.
jphickey
added a commit
that referenced
this pull request
May 4, 2020
The osconfig.h file is now generated rather than as a normal header file in the source tree. A path must be included to resolve refs in doxygen.
jphickey
added a commit
that referenced
this pull request
May 5, 2020
Generate an osconfig.h specially for doxygen, independently of the file actually used for the build.
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.
Describe the contribution
Rather than CFE generating an osconfig.h file directly, it just needs to select file(s) from the defs directory and pass them to OSAL for the config.
This makes it compatible with the upcoming nasa/osal#285 change (in PR nasa/osal#427)
Fixes #652
Testing performed
Build code with default provided and confirm that OSAL generates the correct config (osconfig.h) and the build succeeds
Expected behavior changes
Users must now select OSAL options via the CMake file in their defs directory, rather than the
osconfig.hfile.System(s) tested on
Ubuntu 20.04 LTS
Additional context
Correlates with nasa/osal#427
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.