From 3611b52e908470cf31e3ceb9589440ec5cf77fb4 Mon Sep 17 00:00:00 2001 From: Wolfgang Hess Date: Thu, 23 Jul 2020 11:46:59 +0200 Subject: [PATCH] Only set C++11 explicitly for old versions of GCC. (#1724) Starting with GCC 6.1, C++14 became the default. Signed-off-by: Wolfgang Hess --- cmake/functions.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/functions.cmake b/cmake/functions.cmake index a9336aa..1bbce43 100644 --- a/cmake/functions.cmake +++ b/cmake/functions.cmake @@ -76,7 +76,11 @@ macro(google_initialize_cartographer_project) if(WIN32) # TODO turn on equivalent warnings on Windows else() - set(GOOG_CXX_FLAGS "-pthread -std=c++11 -fPIC ${GOOG_CXX_FLAGS}") + set(GOOG_CXX_FLAGS "-pthread -fPIC ${GOOG_CXX_FLAGS}") + + if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.1) + google_add_flag(GOOG_CXX_FLAGS "-std=c++11") + endif() google_add_flag(GOOG_CXX_FLAGS "-Wall") google_add_flag(GOOG_CXX_FLAGS "-Wpedantic")