..

Author: JohanMabille

benchmark/CMakeLists.txt

@@ -28,13 +28,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
     endif()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-parameter -Wextra -Wreorder")
-    CHECK_CXX_COMPILER_FLAG("-std=c++14" HAS_CPP14_FLAG)
-
-    if (HAS_CPP14_FLAG)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-    else()
-        message(FATAL_ERROR "Unsupported compiler -- xtensor requires C++14 support!")
-    endif()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 
     # Enable link time optimization and set the default symbol
     # visibility to hidden (very important to obtain small binaries)

test/CMakeLists.txt

@@ -33,9 +33,7 @@ string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE)
 
 include(set_compiler_flag.cmake)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-
-#[[if(CPP20)
+if(CPP20)
   # User requested C++20, but compiler might not oblige.
   set_compiler_flag(
     _cxx_std_flag CXX
@@ -57,7 +55,6 @@ endif()
 if(NOT _cxx_std_flag)
   message(FATAL_ERROR "xtensor-blas needs a C++17-compliant compiler.")
 endif()
-]]
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Intel" AND NOT WIN32))
   CHECK_CXX_COMPILER_FLAG(-march=native arch_native_supported)

xtensor-blasConfig.cmake.in

@@ -24,7 +24,7 @@ if(NOT TARGET @PROJECT_NAME@)
   find_dependency(LAPACK REQUIRED)
   target_link_libraries(xtensor-blas INTERFACE ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
   if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.8)
-    target_compile_features(xtensor-blas INTERFACE cxx_std_14)
+    target_compile_features(xtensor-blas INTERFACE cxx_std_17)
   endif()
 endif()