Merge branch 'master' of github.com:introlab/rtabmap into devel

This commit is contained in:
matlabbe
2016-06-15 16:39:25 -04:00

View File

@@ -188,10 +188,17 @@ IF(G2O_FOUND)
ENDIF(G2O_FOUND) ENDIF(G2O_FOUND)
IF(GTSAM_FOUND) IF(GTSAM_FOUND)
SET(INCLUDE_DIRS IF(GTSAM_INCLUDE_DIR)
${INCLUDE_DIRS} SET(INCLUDE_DIRS
${GTSAM_INCLUDE_DIRS} ${GTSAM_INCLUDE_DIR} # place it in front to use Eigen installed by GTSAM
) ${INCLUDE_DIRS}
)
ELSE()
SET(INCLUDE_DIRS
${GTSAM_INCLUDE_DIRS} # cmake standard
${INCLUDE_DIRS}
)
ENDIF()
SET(LIBRARIES SET(LIBRARIES
${LIBRARIES} ${LIBRARIES}
gtsam gtsam