fixe cmake

This commit is contained in:
Jeremie Deray
2017-08-12 18:16:01 +02:00
parent 4d3cd73e91
commit 07c9a7b46c

View File

@@ -14,15 +14,17 @@ find_package(catkin REQUIRED COMPONENTS
tf tf
) )
set(MRPT_DONT_USE_DBG_LIBS 1)
## System dependencies are found with CMake's conventions ## System dependencies are found with CMake's conventions
find_package(Boost REQUIRED COMPONENTS system) find_package(Boost REQUIRED COMPONENTS system)
find_package(cmake_modules REQUIRED) find_package(cmake_modules REQUIRED)
find_package(Eigen3 REQUIRED) find_package(Eigen3 REQUIRED)
find_package(MRPT REQUIRED base obs maps slam) find_package(MRPT REQUIRED base obs) # maps slam
#include_directories(${MRPT_INCLUDE_DIRS}) #include_directories(${MRPT_INCLUDE_DIRS})
#MESSAGE( STATUS "MRPT_INCLUDE_DIRS: " ${MRPT_INCLUDE_DIRS}) MESSAGE( STATUS "MRPT_INCLUDE_DIRS: " ${MRPT_INCLUDE_DIRS})
#link_directories(${MRPT_LIBRARY_DIRS}) #link_directories(${MRPT_LIBRARY_DIRS})
#MESSAGE( STATUS "MRPT_LIBRARY_DIRS: " ${MRPT_LIBS}) MESSAGE( STATUS "MRPT_LIBRARY_DIRS: " ${MRPT_LIBRARIES})
@@ -37,9 +39,9 @@ find_package(MRPT REQUIRED base obs maps slam)
## DEPENDS: system dependencies of this project that dependent projects also need ## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package( catkin_package(
INCLUDE_DIRS include INCLUDE_DIRS include
LIBRARIES laser_odometry LIBRARIES ${PROJECT_NAME}
CATKIN_DEPENDS nav_msgs roscpp sensor_msgs std_msgs tf CATKIN_DEPENDS nav_msgs roscpp sensor_msgs std_msgs tf
#DEPENDS system_lib DEPENDS MRPT
) )
## Specify additional locations of header files ## Specify additional locations of header files
@@ -47,25 +49,19 @@ catkin_package(
include_directories(include) include_directories(include)
include_directories( include_directories(
SYSTEM
${catkin_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${EIGEN_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
${MRPT_INCLUDE_DIRS}
) )
## Declare a cpp library ## Declare a cpp library
add_library(${PROJECT_NAME} add_library(${PROJECT_NAME}
src/CLaserOdometry2D.cpp src/CLaserOdometry2D.cpp
) )
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES}) target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${MRPT_LIBS})
## Declare a cpp executable ## Declare a cpp executable
add_executable(rf2o_laser_odometry_node src/CLaserOdometry2DNode.cpp) add_executable(rf2o_laser_odometry_node src/CLaserOdometry2DNode.cpp)
target_link_libraries(rf2o_laser_odometry_node ${PROJECT_NAME}) target_link_libraries(rf2o_laser_odometry_node ${PROJECT_NAME} ${catkin_LIBRARIES})
## Specify libraries to link a library or executable target against
target_link_libraries(rf2o_laser_odometry_node
${catkin_LIBRARIES}
${Boost_LIBRARIES}
${EIGEN_LIBRARIES}
${MRPT_LIBS}
)