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

update to googletest 1.8 #104

Merged
merged 1 commit into from
Aug 9, 2017
Merged

update to googletest 1.8 #104

merged 1 commit into from
Aug 9, 2017

Conversation

dirk-thomas
Copy link
Contributor

The headers provided by gtest/gmock_vendor are now preferred over the system headers since we want to use the newer version of googletest coming with the vendor packages.

The main library needs to be linked before the non-main library since the first one might use symbols which are defined int he second one.

The gmock_vendor doesn't contain its own version of gtest anymore but uses the headers provided by gtest_vendor instead. That also removes the need for the extension point.

Required for ros2/ros2#385.

@dirk-thomas dirk-thomas added the in review Waiting for review (Kanban column) label Aug 8, 2017
@dirk-thomas dirk-thomas self-assigned this Aug 8, 2017
Copy link
Contributor

@mikaelarguedas mikaelarguedas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks good to me, a further improvement would be to get rid completely of gmock_vendor references given that the ament_cmake_gmock provides the necessary wrapper so that none of our packages have to find the "vendor" packages explicitly.

As a side note for the future: starting with zesty, a dependency-free googletest debian package is available

@dirk-thomas
Copy link
Contributor Author

a further improvement would be to get rid completely of gmock_vendor references given that the ament_cmake_gmock provides the necessary wrapper so that none of our packages have to find the "vendor" packages explicitly.

The packages gmock_vendor / gtest_vendor could be renamed anytime to googlemock / googletest. I tried to keep this round of PRs as simple as possible and therefore didn't do it.

The packages still need to exist though until we have googletest as a binary package on all supported platforms.

@dirk-thomas dirk-thomas merged commit e70b1cf into master Aug 9, 2017
@dirk-thomas dirk-thomas deleted the googletest branch August 9, 2017 17:09
@dirk-thomas dirk-thomas removed the in review Waiting for review (Kanban column) label Aug 9, 2017
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.

None yet

2 participants