diff --git a/CMakeLists.txt b/CMakeLists.txt index dea44e5313dcdb6ad8fbe7bc886762c430ede448..2392d4f7c9fb9dd835b97e424a95547d7d489321 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,8 @@ IF(NOT CMAKE_BUILD_TYPE) FORCE) ENDIF() +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CXX_STANDARD 17) list(APPEND CMAKE_MODULE_PATH ${Simox_SOURCE_DIR}/CMakeModules) MESSAGE (STATUS "** Module path: " ${CMAKE_MODULE_PATH}) diff --git a/CMakeModules/BulletCheckPrecision.cmake b/CMakeModules/BulletCheckPrecision.cmake index 93c99b7ada79a1e708b2743f70f688672e070158..d6e3dd75092e4903add95e12af1c476169c17210 100644 --- a/CMakeModules/BulletCheckPrecision.cmake +++ b/CMakeModules/BulletCheckPrecision.cmake @@ -7,7 +7,7 @@ macro(BulletCheckPrecision) CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:string=${BULLET_INCLUDE_DIRS}" "-DLINK_LIBRARIES:string=${BULLET_LIBRARIES}" - "-DCMAKE_CXX_FLAGS:string=-std=c++11" + "-DCMAKE_CXX_FLAGS:string=-std=c++17" COMPILE_DEFINITIONS "-DBT_USE_DOUBLE_PRECISION" OUTPUT_VARIABLE _buildOutDouble @@ -37,7 +37,7 @@ macro(BulletCheckPrecision) message(STATUS " CMAKE_FLAGS") message(STATUS " -DINCLUDE_DIRECTORIES:string=${BULLET_INCLUDE_DIRS}") message(STATUS " -DLINK_LIBRARIES:string=${BULLET_LIBRARIES}") - message(STATUS " -DCMAKE_CXX_FLAGS:string=-std=c++11") + message(STATUS " -DCMAKE_CXX_FLAGS:string=-std=c++17") message(STATUS " COMPILE_DEFINITIONS") message(STATUS " -DBT_USE_DOUBLE_PRECISION") message(STATUS "Build output for double precision:")