From ce17c6550835cfe85a5ef76faa889354d44ea930 Mon Sep 17 00:00:00 2001 From: albertoesmp Date: Tue, 2 Apr 2024 13:40:03 +0200 Subject: [PATCH] Updated CMake to use C++14 and commented line to enable static memory sanitization --- cmake/CMakeConfig.cmake | 6 +----- src/main/helios_version.cpp | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cmake/CMakeConfig.cmake b/cmake/CMakeConfig.cmake index 4ebb07a74..062d09142 100644 --- a/cmake/CMakeConfig.cmake +++ b/cmake/CMakeConfig.cmake @@ -9,11 +9,7 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE RELEASE) endif() # Common flags -if(PCL_BINDING) - set(CMAKE_CXX_STANDARD 14) -else() - set(CMAKE_CXX_STANDARD 11) -endif() +set(CMAKE_CXX_STANDARD 14) if(WIN32 OR MSVC) # Windows flags set(CMAKE_CXX_FLAGS_RELEASE "/MD /O2 /Ob2 /DNDEBUG") set(CMAKE_CXX_FLAGS_DEBUG "") diff --git a/src/main/helios_version.cpp b/src/main/helios_version.cpp index b5c2f85a6..39f2a20b9 100644 --- a/src/main/helios_version.cpp +++ b/src/main/helios_version.cpp @@ -4,7 +4,7 @@ const char * HELIOS_VERSION = "1.3.0"; -const char * HELIOS_GIT_HASH = "d35650b5"; +const char * HELIOS_GIT_HASH = "4aa844cd"; const char * getHeliosVersion(){ return HELIOS_VERSION;