Add GTest 1.8 compatibility and reduce duplicated code #914
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
dirk-thomas
reviewed
Jan 24, 2018
| @@ -389,13 +325,12 @@ if(NOT GMOCK_FOUND) | |||
| endif() | |||
| _install(${ARGN}) | |||
| endfunction() | |||
| add_subdirectory(${gtest_base_dir} ${gtest_lib_dir}) | |||
| add_subdirectory(${base_dir} ${gtest_lib_dir}) | |||
| set(_CATKIN_SKIP_INSTALL_RULES FALSE) | |||
| set_target_properties(${gtest_libs} ${gtest_main_libs} | |||
| PROPERTIES EXCLUDE_FROM_ALL 1) | |||
There was a problem hiding this comment.
This property also needs to be set for the gmock targets.
There was a problem hiding this comment.
You are right, I have ammended the commit to include this change.
v-lopez
force-pushed
the
gtest-1.8-compatibility
branch
from
d7aa040 to
b5ffdba
Compare
|
This looks good in a small workspace on Melodic. Thank you again for the patch! |
dirk-thomas
reviewed
Jan 30, 2018
| "${_gmock_source_paths}" _gmock_found | ||
| _gmock_base_dir _gmock_include_dir _gmock_lib_dir | ||
| _gmock_libs _gmock_main_libs) | ||
| if(gmock_found) |
There was a problem hiding this comment.
I think this line is incorrect. See #919.
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.
No description provided.