diff --git a/CMakeLists.txt b/CMakeLists.txt index c1446545c..a5c5d113c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,21 +70,13 @@ mark_as_advanced(HIGHFIVE_SANITIZER) # ----------------------------------- if(NOT DEFINED CMAKE_CXX_STANDARD) - if(HIGHFIVE_TEST_XTENSOR) - set(CMAKE_CXX_STANDARD 14) - else() - set(CMAKE_CXX_STANDARD 11) - endif() + set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) endif() -if(CMAKE_CXX_STANDARD EQUAL 98) - message(FATAL_ERROR "HighFive needs to be compiled with at least C++11") -endif() - -if(HIGHFIVE_TEST_XTENSOR AND CMAKE_CXX_STANDARD LESS 14) - message(FATAL_ERROR "XTensor requires C++14 or newer.") +if(CMAKE_CXX_STANDARD EQUAL 98 OR CMAKE_CXX_STANDARD LESS 14) + message(FATAL_ERROR "HighFive needs to be compiled with at least C++14") endif() add_compile_definitions(HIGHFIVE_CXX_STD=${CMAKE_CXX_STANDARD}) diff --git a/README.md b/README.md index 0eae323e4..49beff63c 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Documentation: https://bluebrain.github.io/HighFive/ ## Brief -HighFive is a modern header-only C++11 friendly interface for libhdf5. +HighFive is a modern header-only C++14 friendly interface for libhdf5. HighFive supports STL vector/string, Boost::UBLAS, Boost::Multi-array and Xtensor. It handles C++ from/to HDF5 with automatic type mapping. HighFive does not require additional libraries (see dependencies). @@ -24,7 +24,7 @@ It integrates nicely with other CMake projects by defining (and exporting) a Hig - Simple C++-ish minimalist interface - No other dependency than libhdf5 - Zero overhead -- Support C++11 +- Support C++14 ### Feature support - create/read/write files, datasets, attributes, groups, dataspaces. diff --git a/tests/cmake_integration/application/CMakeLists.txt b/tests/cmake_integration/application/CMakeLists.txt index 469344e9b..8f2a71423 100644 --- a/tests/cmake_integration/application/CMakeLists.txt +++ b/tests/cmake_integration/application/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.14) project(Hi5Application VERSION 0.1) if(NOT DEFINED CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) endif() diff --git a/tests/cmake_integration/dependent_library/CMakeLists.txt b/tests/cmake_integration/dependent_library/CMakeLists.txt index 1cdbaf35a..ad76d99b2 100644 --- a/tests/cmake_integration/dependent_library/CMakeLists.txt +++ b/tests/cmake_integration/dependent_library/CMakeLists.txt @@ -15,7 +15,7 @@ cmake_minimum_required(VERSION 3.14) project(Hi5Dependent VERSION 0.1) if(NOT DEFINED CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) endif() diff --git a/tests/cmake_integration/test_dependent_library/CMakeList.txt b/tests/cmake_integration/test_dependent_library/CMakeList.txt index b8b7cb021..08bc4a4ad 100644 --- a/tests/cmake_integration/test_dependent_library/CMakeList.txt +++ b/tests/cmake_integration/test_dependent_library/CMakeList.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.14) project(TestHi5Dependent VERSION 0.1) if(NOT DEFINED CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) endif() diff --git a/tests/cmake_integration/test_dependent_library/CMakeLists.txt b/tests/cmake_integration/test_dependent_library/CMakeLists.txt index b6c7f3375..c9023f98a 100644 --- a/tests/cmake_integration/test_dependent_library/CMakeLists.txt +++ b/tests/cmake_integration/test_dependent_library/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.14) project(TestHi5Dependent VERSION 0.1) if(NOT DEFINED CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) endif()