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

Minor fixes for Cartographer from ROS (#1705) 

* restrict boost dependencies to the ones used
* Also add googletest as a build dependency.
* Set GMOCK_INCLUDE_DIRS when doing src fallback.

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
Co-authored-by: Mikael Arguedas <mikael.arguedas@gmail.com>
master
Chris Lalancette 2020-10-23 09:38:58 -04:00 committed by GitHub
parent a9ad813c26
commit 1f69b83e8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/modules/FindGMock.cmake
View File

@ -77,6 +77,7 @@ if(NOT GMock_FOUND)
EXCLUDE_FROM_ALL) EXCLUDE_FROM_ALL)
endif() endif()
set(GMOCK_LIBRARIES gmock_main) set(GMOCK_LIBRARIES gmock_main)
set(GMOCK_INCLUDE_DIRS ${GMOCK_SRC_DIR}/include)
endif() endif()
endif() endif()

3
package.xml
View File

@ -38,9 +38,10 @@
<build_depend>git</build_depend> <build_depend>git</build_depend>
<build_depend>google-mock</build_depend> <build_depend>google-mock</build_depend>
<build_depend>gtest</build_depend>
<build_depend>python3-sphinx</build_depend> <build_depend>python3-sphinx</build_depend>
<depend>boost</depend> <depend>libboost-iostreams-dev</depend>
<depend>eigen</depend> <depend>eigen</depend>
<depend>libcairo2-dev</depend> <depend>libcairo2-dev</depend>
<depend>libceres-dev</depend> <depend>libceres-dev</depend>