From b727eadfc71dff8dabce7bdc3da3aeed6476d9a2 Mon Sep 17 00:00:00 2001 From: ClausKlein Date: Mon, 15 Feb 2021 21:01:56 +0100 Subject: [PATCH] back to c++17 --- CMakeLists.txt | 2 +- cmake/tools.cmake | 2 +- test/source/greeter.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8a4dff..f04a2cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ option(BUILD_SHARED_LIBS "Create shared libraries if ON" YES) # XXX endif() if(NOT DEFINED CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 20) + set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS NO) endif() diff --git a/cmake/tools.cmake b/cmake/tools.cmake index 3d87468..3ed235e 100644 --- a/cmake/tools.cmake +++ b/cmake/tools.cmake @@ -10,7 +10,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/CPM.cmake) CPMUsePackageLock(package-lock.cmake) if(NOT DEFINED CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 20) + set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS NO) endif() diff --git a/test/source/greeter.cpp b/test/source/greeter.cpp index 6fabbb5..ff3204b 100644 --- a/test/source/greeter.cpp +++ b/test/source/greeter.cpp @@ -14,7 +14,7 @@ TEST_CASE("Greeter") { } TEST_CASE("Greeter version") { -#if (__APPLE__ || __cpp_lib_starts_ends_with) +#if (__cpp_lib_starts_ends_with) static_assert(std::string_view(GREETER_VERSION).starts_with("1")); // TBD C++20 only CHECK(std::string(GREETER_VERSION).starts_with("1")); // SameMajorVersion #else