From 20a13c829d4538fe7674c6f677d6c836728cbf01 Mon Sep 17 00:00:00 2001 From: cryptocode Date: Tue, 25 Feb 2020 23:32:32 +0100 Subject: [PATCH] Use C++17 locally, C++14 on CI (#2597) Co-authored-by: Russel Waters Co-authored-by: Russel Waters --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a67294ef..e19ba83d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,7 +170,11 @@ set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD_REQUIRED ON) #set(CMAKE_C_EXTENSIONS OFF) -set(CMAKE_CXX_STANDARD 14) +set(NANO_SUPPORTED_CPP_STANDARD "17" CACHE STRING "Supported C++ standard (14 or 17)") +if (CI_BUILD OR CI_TEST) + set(NANO_SUPPORTED_CPP_STANDARD "14") +endif() +set(CMAKE_CXX_STANDARD ${NANO_SUPPORTED_CPP_STANDARD}) set(CMAKE_CXX_STANDARD_REQUIRED ON) #set(CMAKE_CXX_EXTENSIONS OFF)