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 #2315, uniqueness of tbl target names #2319

Merged
merged 1 commit into from May 4, 2023

Conversation

jphickey
Copy link
Contributor

@jphickey jphickey commented May 2, 2023

Checklist (Please check before submitting)

Describe the contribution
If the passed-in table name does not use a qualifier suffix, then generate one by computing a hash of the context information. This ensures that the generated intermediate target names will be unique.

Fixes #2315

Testing performed
Replicated original error by doing additional "add_cfe_tables" for sample app in local project config, got duplicate name error from CMake. Apply this patch, repeat build, and got all table files successfully.

Expected behavior changes
No more target name conflict

System(s) tested on
Debian

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

If the passed-in table name does not use a qualifier suffix, then
generate one by computing a hash of the context information.  This
ensures that the generated intermediate target names will be unique.
@jphickey jphickey force-pushed the fix-2315-table-tgt-unique branch from b16a4c0 to 4a11c24 Compare May 2, 2023 18:07
@jphickey jphickey added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label May 2, 2023
@jphickey
Copy link
Contributor Author

jphickey commented May 2, 2023

Latest update adds some more debug/status info messages when running cmake with "VERBOSE=1" flag set. Ideally, nobody should need to reference the internal target names, but if they do, this flag sheds more light as to what is going on with the internal logic.

@dzbaker dzbaker added CCB:Approved Indicates code review and approval by community CCB and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels May 4, 2023
dzbaker added a commit to nasa/cFS that referenced this pull request May 4, 2023
*Combines:*

cFE v7.0.0-rc4+dev304

**Includes:**

*cFE*
- nasa/cFE#2321
- nasa/cFE#2214
- nasa/cFE#2319

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
dzbaker added a commit to nasa/cFS that referenced this pull request May 4, 2023
*Combines:*

cFE v7.0.0-rc4+dev304

**Includes:**

*cFE*
- nasa/cFE#2321
- nasa/cFE#2214
- nasa/cFE#2319

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
dzbaker added a commit to nasa/cFS that referenced this pull request May 4, 2023
*Combines:*

cFE v7.0.0-rc4+dev304

**Includes:**

*cFE*
- nasa/cFE#2321
- nasa/cFE#2214
- nasa/cFE#2319

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
@dzbaker dzbaker merged commit ac9bb49 into nasa:main May 4, 2023
21 checks passed
dzbaker added a commit to nasa/cFS that referenced this pull request May 4, 2023
*Combines:*

cFE v7.0.0-rc4+dev304

**Includes:**

*cFE*
- nasa/cFE#2321
- nasa/cFE#2214
- nasa/cFE#2319

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
@dmknutsen dmknutsen added this to the Equuleus milestone May 26, 2023
@jphickey jphickey deleted the fix-2315-table-tgt-unique branch May 31, 2023 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB enhancement Equuleus-rc1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Uniqueness of intermediate table target names
4 participants