From 07c9a7b46c165479c29a23a807e9c2b724857597 Mon Sep 17 00:00:00 2001 From: Jeremie Deray Date: Sat, 12 Aug 2017 18:16:01 +0200 Subject: [PATCH] fixe cmake --- CMakeLists.txt | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2620f43..ac5f2b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,15 +14,17 @@ find_package(catkin REQUIRED COMPONENTS tf ) +set(MRPT_DONT_USE_DBG_LIBS 1) + ## System dependencies are found with CMake's conventions find_package(Boost REQUIRED COMPONENTS system) find_package(cmake_modules 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}) -#MESSAGE( STATUS "MRPT_INCLUDE_DIRS: " ${MRPT_INCLUDE_DIRS}) +MESSAGE( STATUS "MRPT_INCLUDE_DIRS: " ${MRPT_INCLUDE_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 catkin_package( INCLUDE_DIRS include - LIBRARIES laser_odometry + LIBRARIES ${PROJECT_NAME} CATKIN_DEPENDS nav_msgs roscpp sensor_msgs std_msgs tf - #DEPENDS system_lib + DEPENDS MRPT ) ## Specify additional locations of header files @@ -47,25 +49,19 @@ catkin_package( include_directories(include) include_directories( + SYSTEM ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} + ${MRPT_INCLUDE_DIRS} ) ## Declare a cpp library add_library(${PROJECT_NAME} src/CLaserOdometry2D.cpp ) -target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES}) +target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${MRPT_LIBS}) ## Declare a cpp executable add_executable(rf2o_laser_odometry_node src/CLaserOdometry2DNode.cpp) -target_link_libraries(rf2o_laser_odometry_node ${PROJECT_NAME}) - -## 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} -) +target_link_libraries(rf2o_laser_odometry_node ${PROJECT_NAME} ${catkin_LIBRARIES})