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

Add CLI11 to Tf #2107

Merged
merged 1 commit into from
Dec 9, 2022
Merged

Add CLI11 to Tf #2107

merged 1 commit into from
Dec 9, 2022

Conversation

dgovil
Copy link
Collaborator

@dgovil dgovil commented Nov 28, 2022

Description of Change(s)

This PR adds CLI11 to Tf under the pxr/base/tf/pxrCLI11 in the PXR_NS namespace.

This splits out the addition of the library in #2090 per the notes there.

  • I have verified that all unit tests pass with the proposed changes
  • I have submitted a signed Contributor License Agreement

@sunyab
Copy link
Contributor

sunyab commented Nov 29, 2022

Filed as internal issue #USD-7796

@sunyab
Copy link
Contributor

sunyab commented Dec 7, 2022

Hey @dgovil, just a heads-up: we've merged this PR internally but during review wound up making some changes to more fully isolate the CLI11 in Tf by adding extra compile-time checks and a hardcoded pxr_CLI namespace along with the normal pxr namespace. These are to guard against the unlikely-but-possible cases where USD's embedded CLI11 might conflict with another version of CLI11 in user code.

Practically, this means the other PRs that build against Tf's CLI11 will need to have something like using namespace pxr_CLI added. I'm adding that in as I merge the other PRs, but wanted to let you know FYI.

@dgovil
Copy link
Collaborator Author

dgovil commented Dec 8, 2022 via email

@pixar-oss pixar-oss merged commit d990339 into PixarAnimationStudios:dev Dec 9, 2022
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.

3 participants