mirrors/rf2o_laser_odometry
1
0
Fork 0
mirror of https://github.com/MAPIRlab/rf2o_laser_odometry.git synced 2023-04-06 19:28:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into separating_node_computation

Browse Source
This commit is contained in:
Javier G. Monroy
2018-11-21 13:13:03 +01:00
committed by GitHub
parent 737f44b0db ecae84c511
commit 45209497bf
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@@ -1,6 +1,13 @@
cmake_minimum_required(VERSION 2.8.3) PROJECT(rf2o_laser_odometry)
project(rf2o_laser_odometry)
set (CMAKE_CXX_STANDARD 14) # Require C++14 CMAKE_MINIMUM_REQUIRED(VERSION 3.3)
# Require C++17
if(${CMAKE_VERSION} VERSION_LESS "3.8.0")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
else()
set(CMAKE_CXX_STANDARD 17)
endif()
## Find catkin macros and libraries ## Find catkin macros and libraries
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
@@ -21,6 +28,7 @@ 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})

1
include/rf2o_laser_odometry/CLaserOdometry2D.h
View File

@@ -30,7 +30,6 @@
# include <mrpt/slam/CObservation2DRangeScan.h> # include <mrpt/slam/CObservation2DRangeScan.h>
# include <mrpt/slam/CObservationOdometry.h> # include <mrpt/slam/CObservationOdometry.h>
typedef mrpt::poses::CObservation2DRangeScan CObservation2DRangeScan; typedef mrpt::poses::CObservation2DRangeScan CObservation2DRangeScan;
#endif #endif
#if MRPT_VERSION<0x150 #if MRPT_VERSION<0x150