From a34ec109ef9903259fd622cad6b5e0876d6f7fd5 Mon Sep 17 00:00:00 2001 From: matlabbe Date: Sun, 5 Sep 2021 17:43:50 -0400 Subject: [PATCH] Fixed #637 (bug introduced by this commit https://github.com/introlab/rtabmap_ros/commit/31da18478308689fdecfdab58c8505c558d61777 for kinetic) --- CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 062c946d..3662c922 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,11 +47,17 @@ add_compile_options(-bigobj) ENDIF(WIN32) # kinetic issue, rtabmap now requires at least c++11 +if("$ENV{ROS_DISTRO}" STREQUAL "kinetic") include(CheckCXXCompilerFlag) +CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14) CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) -IF(COMPILER_SUPPORTS_CXX11) +IF(COMPILER_SUPPORTS_CXX14) + set(CMAKE_CXX_STANDARD 14) +ELSEIF(COMPILER_SUPPORTS_CXX11) set(CMAKE_CXX_STANDARD 11) -ENDIF(COMPILER_SUPPORTS_CXX11) +ENDIF() +endif() + option(RTABMAP_SYNC_MULTI_RGBD "Build with multi RGBD camera synchronization support" OFF) option(RTABMAP_SYNC_USER_DATA "Build with input user data support" OFF)