Correctly set gtest 1.8 root directory #1014
Conversation
|
@wjwwood @dirk-thomas Could you take a look at this? |
|
The CI build fails like this: Does not seem related though. I still need to test this on Ubuntu 16.04 and 18.04 with and without gtest sources inside the workspace to make sure it works. |
@dgossow Please rebase your change on top of the latest state of the target branch. |
|
@dgossow Friendly ping. |
dgossow
force-pushed
the
kinetic-devel
branch
2 times, most recently
from
f1d6ab9 to
4c1a324
Compare
|
Sorry, I was distracted. So I essentially rebased this on top of kinetic-devel like requested. I also tested this on 16.04 and 18.04. 16.04: 18.04: Finding the current version (master) of gmock/gtest under src/googletest works in both cases. |
In gtest version 1.8 or higher, there is a CMakeLists.txt in the
parent directory of the gtest source directory which we need to find.
This can be either /usr/src/googletest or
${CMAKE_SOURCE_DIR}/googletest.
The current version would only check in /usr/src/googletest even if
gtest was found in the project's src/ directory.
This would break the build on Ubuntu 18.04, where the system install of
gmock is version 1.8, if your project includes a newer version of gtest
in its src/ directory. The result would be that headers from src/ would
be used, but the test executables would be linked to the binaries from
/usr/src.
|
@dirk-thomas comments addressed |
|
Thanks for the patch. |
In gtest version 1.8 or higher, there is a CMakeLists.txt in the
parent directory of the gtest source directory which we need to find.
This can be either /usr/src/googletest or ${CMAKE_SOURCE_DIR}/googletest.
The current version would only check in /usr/src/googletest even if
gtest was found in the project's src/ directory.
This would break the build on Ubuntu 18.04, where the system install of gmock
is version 1.8, if your project includes a newer version of gtest in its src/ directory.
The result would be that headers from src/ would be used, but the test
executables would be linked to the binaries from /usr/src.