Fix GTSAM version detection for 4.0.2 #137
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Exported config files are preferred over modules, and easier to maintain.
|
@Ellon I'm slightly confused. You've taken the version bump commit that you pushed into master, then cherry picked commits from develop without the commit from @jlblancoc that bumps the version. I am not sure how that would affect a future release in terms of merge conflicts from develop to master. Can you make this PR have only cherry picked commits from develop? (specifically adding b3dccc6) |
|
But, master already has the 4.0.2 version.... |
|
But doesn't that same argument apply for commit b3dccc6? When develop next gets merged into master, master will already have 4.0.2 as the version (when this PR gets merged to master). |
|
@varunagrawal you can now merge, move tag |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed on #136 this PR cherry-picks commits from develop that are needed to let CMake detect the version of GTSAM.
I think only two commits are needed:
Note that this PR proposes a merge into master, as I see it as a (hot?) fix that can be added to 4.0.2 if the tag is moved properly (again, as discussed on #136).
Let me know if I should add any other commits.
Best,
This change is