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

Fix #135, Add separate CMakeLists.txt for each implementation #148

Merged

Conversation

jphickey
Copy link
Contributor

@jphickey jphickey commented Apr 3, 2020

Describe the contribution
Do not use aux_source_directory to assemble a list of source files. Instead, put a proper CMakeLists.txt file in each implementation and build the implementation separately from the shared/common parts.

In addition to avoiding the aux_source_directory this allows PSP-specific compile definitions to be set on a per-implementation basis because it is defined separately.

Fixes #135

Testing performed
Build code for all supported targets (ppc-vxworks6.9, i686-rtems4.11, native/x86-64 linux). Verify clean build. Confirm CFE boots and responds to commands as normal.

Expected behavior changes
No impact to behavior - changes build script only.

System(s) tested on
Ubuntu 18.04 LTS 64-bit + GSFC vxworks build machine

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

Do not use aux_source_directory to assemble a list of source files.
Instead, put a proper CMakeLists.txt file in each implementation
and build the implementation separately from the shared/common parts.

In addition to avoiding the aux_source_directory this allows PSP-specific
compile definitions to be set on a per-implementation basis because
it is defined separately.
@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Apr 6, 2020
@astrogeco
Copy link
Contributor

CCB 20200408 - APPROVED

@astrogeco astrogeco added CCB - 20200408 CCB:Approved Indicates Approval by CCB and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Apr 8, 2020
@astrogeco astrogeco changed the base branch from master to integration-candidate April 14, 2020 21:30
@astrogeco astrogeco merged commit 2890a78 into nasa:integration-candidate Apr 14, 2020
@jphickey jphickey deleted the fix-135-psp-separate-libs branch May 14, 2020 14:56
@skliper skliper added this to the 1.5.0 milestone Jun 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates Approval by CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Implement psps without relying on aux_source_directory
3 participants