cmake: Fix support for non-standard psp source directory#1864
Merged
astrogeco merged 1 commit intonasa:integration-candidatefrom Aug 31, 2021
Merged
Conversation
jphickey
approved these changes
Aug 25, 2021
Contributor
|
Thanks for the contribution @jbohren-hbr ! I opened a related issue to help us write the version description document. Can you double check it and add comments as needed? |
Contributor
Author
|
#1921 looks good to me! |
astrogeco
pushed a commit
to astrogeco/cFE
that referenced
this pull request
Sep 1, 2021
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Sep 1, 2021
2 tasks
Contributor
|
CCB:2021-09-01 APPROVED |
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Sep 1, 2021
**Combines** nasa/cFE#1885, v6.8.0-rc1+dev980 nasa/osal#1138, v5.1.0-rc1+dev598 nasa/cFS-GroundSystem#195, v2.2.0-rc1+dev63 **Includes** *cFE* nasa/cFE#1870, Add SB API test cases nasa/cFE#1869, Add ES API test cases nasa/cFE#1872, Add TBL API test cases nasa/cFE#1871, Add FS API test cases nasa/cFE#1860, Add Time Clock Test nasa/cFE#1862, EVS coverage test nasa/cFE#1876, SB test improvements nasa/cFE#1865, CFE_TBL_Modified: Test CRC, updated flag nasa/cFE#1881, Improve EVS code coverage nasa/cFE#1877, add call to CFE_ES_ExitChildTask nasa/cFE#1902, Incorrect OSAL Format in Users Guide Reference nasa/cFE#1884, Improve FS coverage nasa/cFE, Improve MSG branch coverage nasa/cFE#1891, Improve resource ID branch coverage nasa/cFE#1894, Improve SBR branch coverage nasa/cFE#1896, Fix #1895, Improve TIME branch coverage nasa/cFE#1904, Improve TBL code coverage nasa/cFE#1864, Support custom PSP directory nasa/cFE#1913, Update time tests to use bitmask check macros nasa/cFE#1923, remove extra word in comment *osal* nasa/osal#1136, add bitmask assert macros *cFS-GroundSystem* nasa/cFS-GroundSystem#190, Fix #189, Virtualenv and Pipenv .gitignore support nasa/cFS-GroundSystem#194, Fix doc, comment, and message typos Co-authored-by: Jacob Hageman <[email protected]> Co-authored-by: Joseph Hickey <[email protected]> Co-authored-by: Alex Campbell <[email protected]> Co-authored-by: Ariel Adams <[email protected]> Co-authored-by: Jose F Martinez Pedraza <[email protected]> Co-authored-by: Avi <[email protected]> Co-authored-by: Paul <[email protected]>
This file contains hidden or 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
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
This PR fixes a bug which prevents non-standard psp source directory specification via the environment variable
$CFS_APP_PATHor the cmake variable${psp_SEARCH_PATH}.The cFE cmake build infrastructure uses the environment / cmake variable
$CFS_APP_PATHas well as the cmake meta-variable pattern
${${APP}_SEARCH_PATH}to locate apps and other modules (such as psp), and subsequently sets the variable pattern${${APP}_MISSION_DIR}(see mission_build.cmake lines 202-222).However, the resulting variable
${psp_MISSION_DIR}is not used inprocess_arch()in arch_build.cmake line 588 when including a target platform'sbuild_options.cmakefile. This causes a cmake configuration failure when trying to use a non-standard psp location.Testing performed
Build with psp in non-standard location, with the
CFS_APP_PATHenvironment variable set:Before this PR:
After this PR:
Expected behavior changes
This should only affect projects which use the environment variable
$CFS_APP_PATHor the cmake variable${psp_SEARCH_PATH}. Currently, they are being ignored forpsp'sbuild_options.cmakepath resolution, which means some users may be building with different target build options than they think they are based on the intended behavior.System(s) tested on
v6.8.0-rc1+dev933Additional context
Aside, this is also suggested as a method to specify a non-standard
pspsource directory in mission_defaults.cmake line 67 since PR #751 with the following:However, this will lead to the same cmake configure error as above without this fix.
Third party code
No thirdy party code included in this contribution.
Contributor Info - All information REQUIRED for consideration of pull request
Jonathan Bohren, Honeybee Robotics