Skip to content

Commit

Permalink
set 17 as min
Browse files Browse the repository at this point in the history
  • Loading branch information
fnrizzi committed Feb 19, 2024
1 parent 96ee7b2 commit 32aa49b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 12 deletions.
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ endif()

message("${Magenta}>> PRESSIO: CMAKE_CXX_STANDARD is set to ${CMAKE_CXX_STANDARD} ${ColourReset}")

if(CMAKE_CXX_STANDARD STREQUAL "14"
OR CMAKE_CXX_STANDARD STREQUAL "17"
if(CMAKE_CXX_STANDARD STREQUAL "17"
OR CMAKE_CXX_STANDARD STREQUAL "20")
if(NOT "cxx_std_${CMAKE_CXX_STANDARD}" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
message(FATAL_ERROR "Compiler does not support C++${CMAKE_CXX_STANDARD}. This is required.")
Expand Down
7 changes: 1 addition & 6 deletions include/pressio/macros.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,13 @@
#define _PRESSIO_CPLUSPLUS __cplusplus
#endif

#define PRESSIO_CXX_STD_11 201103L
#define PRESSIO_CXX_STD_14 201402L
#define PRESSIO_CXX_STD_17 201703L
#define PRESSIO_CXX_STD_20 202002L
static_assert(_PRESSIO_CPLUSPLUS >= PRESSIO_CXX_STD_14, "PRESSIO requires C++14 or greater.");
static_assert(_PRESSIO_CPLUSPLUS >= PRESSIO_CXX_STD_17, "PRESSIO requires C++17 or greater.");

#if defined PRESSIO_ENABLE_CXX20
#define PRESSIO_ENABLE_CXX17
#endif
#if defined PRESSIO_ENABLE_CXX17
#define PRESSIO_ENABLE_CXX14
#endif

// ----------------------------------------
// logging macros
Expand Down
5 changes: 1 addition & 4 deletions tests/cmake/options.cmake
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
option(PRESSIO_ENABLE_CXX14 "Enable C++14" OFF)
option(PRESSIO_ENABLE_CXX17 "Enable C++17" OFF)
option(PRESSIO_ENABLE_CXX20 "Enable C++20" OFF)

if (CMAKE_CXX_STANDARD EQUAL 14)
add_definitions(-DPRESSIO_ENABLE_CXX14)
elseif(CMAKE_CXX_STANDARD EQUAL 17)
if(CMAKE_CXX_STANDARD EQUAL 17)
add_definitions(-DPRESSIO_ENABLE_CXX17)
elseif(CMAKE_CXX_STANDARD EQUAL 20)
add_definitions(-DPRESSIO_ENABLE_CXX20)
Expand Down

0 comments on commit 32aa49b

Please sign in to comment.