diff --git a/CMakeLists.txt b/CMakeLists.txt index 60d1d0b0ea8..d2e6175f49e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,7 @@ option(ENABLE_HISTORY "Enable using GNU history for history in lua console" ON) if(NOT CMAKE_CROSSCOMPILING) try_run(IEEE754_TEST_RETURN_CODE IEEE754_TEST_COMPILED ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src/compile_time_tests/ieee_754.cpp - CMAKE_FLAGS "-DCMAKE_CXX_STANDARD=11" COMPILE_OUTPUT_VARIABLE IEEE754_TEST_COMPILE_OUTPUT) + CMAKE_FLAGS "-DCMAKE_CXX_STANDARD=14" COMPILE_OUTPUT_VARIABLE IEEE754_TEST_COMPILE_OUTPUT) if(NOT IEEE754_TEST_COMPILED) message(WARNING "Failed to compile the IEEE 754 test. Skipping it.") message(${IEEE754_TEST_COMPILE_OUTPUT}) @@ -199,7 +199,7 @@ if(NOT DEFINED CXX_FLAGS_USER) endif(NOT DEFINED CXX_FLAGS_USER) -set(COMPILER_FLAGS "-std=c++11 -Wall -Wextra -Werror=non-virtual-dtor -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wold-style-cast") +set(COMPILER_FLAGS "-std=c++14 -Wall -Wextra -Werror=non-virtual-dtor -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wold-style-cast") if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(COMPILER_FLAGS "${COMPILER_FLAGS} -Qunused-arguments -Wno-unknown-warning-option -Wmismatched-tags -Wno-conditional-uninitialized") diff --git a/SConstruct b/SConstruct index dfb8d2b1cd1..f12fbe1a895 100755 --- a/SConstruct +++ b/SConstruct @@ -108,7 +108,7 @@ opts.AddVariables( BoolVariable('ccache', "Use ccache", False), ('ctool', 'Set c compiler command if not using standard compiler.'), ('cxxtool', 'Set c++ compiler command if not using standard compiler.'), - EnumVariable('cxx_std', 'Target c++ std version', '11', ['11', '1y', '14']), + EnumVariable('cxx_std', 'Target c++ std version', '14', ['14']), BoolVariable('openmp', 'Enable openmp use.', False), ('sanitize', 'Enable clang and GCC sanitizer functionality. A comma separated list of sanitize suboptions must be passed as value.', ''), BoolVariable("fast", "Make scons faster at cost of less precise dependency tracking.", False),