12345qiupeng
/
cartographer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not install gmock (#1047) 

Fixes the issue described in https://github.com/googlecartographer/cartographer/pull/1041.

The docker file is not to be merged, it is only here to help reproducing the issue and fix.
master
gaschler 2018-04-11 13:48:03 +02:00 committed by Wally B. Feed
parent 7286415e27
commit e2966ca156
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/modules/FindGMock.cmake
View File

@ -54,7 +54,8 @@ if(NOT GMock_FOUND)
if(GMOCK_SRC_DIR) if(GMOCK_SRC_DIR)
# If src version found, build it. # If src version found, build it.
if(NOT TARGET gmock) if(NOT TARGET gmock)
add_subdirectory(${GMOCK_SRC_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock") add_subdirectory(${GMOCK_SRC_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock"
EXCLUDE_FROM_ALL)
endif() endif()
# The next line is needed for Ubuntu Trusty. # The next line is needed for Ubuntu Trusty.
set(GMOCK_INCLUDE_DIRS "${GMOCK_SRC_DIR}/gtest/include") set(GMOCK_INCLUDE_DIRS "${GMOCK_SRC_DIR}/gtest/include")