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 support for ion-c used with add_subdirectory in parent project #338

Merged
merged 1 commit into from
Feb 14, 2024

Conversation

nirosys
Copy link
Contributor

@nirosys nirosys commented Feb 8, 2024

Issue #, if available: N/A

Description of changes:
This PR fixes some variables used in the version header generation, that resulted in a cmake project not being able to include ion-c via add_subdirectory.

The variables originally used were build-wide binary and source directories. The fix changes them to more localized directories where the ion-c specific files would be located. In addition to writing the header to the wrong location, the git command used to generate the version would also run in the wrong directory gathering the wrong version, or no version at all. This was also fixed.


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@nirosys nirosys marked this pull request as ready for review February 8, 2024 19:49
@nirosys nirosys merged commit 1dc0e0b into amazon-ion:master Feb 14, 2024
14 checks passed
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.

2 participants