Mitigate googlecartographer/cartographer_ros#385 (#351)

Move set_and_check before finding Ceres, because on Ubuntu Zesty,
during finding Ceres, PACKAGE_PREFIX_DIR is overwritten by Eigen.
master
Juraj Oršulić 2017-06-21 13:06:51 +00:00 committed by Wolfgang Hess
parent 9646b31145
commit 0c7b3ee596
1 changed files with 2 additions and 1 deletions

View File

@ -20,6 +20,8 @@
@PACKAGE_INIT@ @PACKAGE_INIT@
set_and_check(CARTOGRAPHER_CMAKE_DIR "@PACKAGE_CARTOGRAPHER_CMAKE_DIR@")
set(CERES_DIR_HINTS @Ceres_DIR@) set(CERES_DIR_HINTS @Ceres_DIR@)
if (cartographer_FIND_QUIETLY) if (cartographer_FIND_QUIETLY)
@ -30,5 +32,4 @@ else ()
find_package(Ceres HINTS ${CERES_DIR_HINTS}) find_package(Ceres HINTS ${CERES_DIR_HINTS})
endif() endif()
set_and_check(CARTOGRAPHER_CMAKE_DIR "@PACKAGE_CARTOGRAPHER_CMAKE_DIR@")
include("${CARTOGRAPHER_CMAKE_DIR}/CartographerTargets.cmake") include("${CARTOGRAPHER_CMAKE_DIR}/CartographerTargets.cmake")