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.

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

Integration candidate: 2021-03-12 #1222

Merged
merged 4 commits into from
Mar 15, 2021
Merged

Integration candidate: 2021-03-12 #1222

merged 4 commits into from
Mar 15, 2021

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Mar 12, 2021

Describe the contribution

Testing performed
CI

Expected behavior changes
See PRs

System(s) tested on
CI

Additional context
None

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
@jphickey

jphickey and others added 2 commits March 12, 2021 13:34
Certain operations in the recent baseline were dependent on a
recent version of CMake.  In particular object libraries cannot
be used in the intended way in the older versions.  This adds
workarounds for those cases.

Tested against CMake versions 3.5.1, 3.10.2, and 3.16.3.
@astrogeco astrogeco merged commit 2b88448 into nasa:main Mar 15, 2021
@skliper skliper deleted the ic-20210312 branch March 23, 2021 13:12
@skliper skliper added this to the 7.0.0 milestone Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Refactor directory structure so it makes sense again (fsw contains non-fsw)
3 participants