diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ccb2e9de..207b1ec1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -407,25 +407,32 @@ if(NOT (CMAKE_VERSION VERSION_LESS "3.1")) set(CMAKE_CXX_EXTENSIONS OFF) else() add_compile_options("$<$,C>:-std=gnu11>") + set(CMAKE_C_STANDARD 11) # set variable just for reporting if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32) if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.1.1") add_compile_options("$<$,CXX>:-std=c++11>") + set(CMAKE_CXX_STANDARD 11) # set variable just for reporting else() add_compile_options("$<$,CXX>:-std=c++14>") + set(CMAKE_CXX_STANDARD 14) # set variable just for reporting endif() endif() if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") if(CLANG_VERSION VERSION_LESS "600") add_compile_options("$<$,CXX>:-std=c++11>") + set(CMAKE_CXX_STANDARD 11) else() add_compile_options("$<$,CXX>:-std=c++14>") + set(CMAKE_CXX_STANDARD 14) endif() else() if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5.0") add_compile_options("$<$,CXX>:-std=c++11>") + set(CMAKE_CXX_STANDARD 11) else() add_compile_options("$<$,CXX>:-std=c++14>") + set(CMAKE_CXX_STANDARD 14) endif() endif() endif()