Use own build script for gtest #485
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
Use clone() instead of cloneSkeleton() for DART < 6.7
brianhou
suggested changes
Jan 17, 2019
| @@ -20,7 +20,11 @@ TEST(CartesianProduct, Clone) | |||
| for (auto i = 0u; i < 5u; ++i) | |||
| { | |||
| auto s1 = space.createState(); | |||
| #if DART_VERSION_AT_LEAST(6,7,0) | |||
There was a problem hiding this comment.
I think this needs to merge changes from #480 first.
# Conflicts: # src/planner/World.cpp # tests/statespace/dart/test_MetaSkeletonStateSpace.cpp # tests/statespace/test_CartesianProduct.cpp # tests/statespace/test_SE2.cpp # tests/statespace/test_SE3.cpp # tests/statespace/test_SO2.cpp # tests/statespace/test_SO3.cpp
gilwoolee
approved these changes
Jan 24, 2019
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.
This PR reverts the customized gtest's build script and uses own build script. This is to simplify the process of updating gtest version without customizing it as discussed in #478.
Depends on #480.
Before merging a pull request
CHANGELOG.md