From b8e79736cbdd29d0538b585100e8489e3d5c5f7e Mon Sep 17 00:00:00 2001 From: Luc Grosheintz Date: Thu, 23 May 2024 09:34:56 +0200 Subject: [PATCH] Don't hard code CMAKE_CXX_STANDARD. --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1c5a120c..bd40b66dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,15 +77,16 @@ mark_as_advanced(HIGHFIVE_SANITIZER) # Check compiler cxx_std requirements # ----------------------------------- +set(HIGHFIVE_CXX_STANDARD_DEFAULT 14) if(NOT DEFINED CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_STANDARD ${HIGHFIVE_CXX_STANDARD_DEFAULT}) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) endif() -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") +if(CMAKE_CXX_STANDARD EQUAL 98 OR CMAKE_CXX_STANDARD LESS ${HIGHFIVE_CXX_STANDARD_DEFAULT}) + message(FATAL_ERROR "HighFive needs to be compiled with at least C++${HIGHFIVE_CXX_STANDARD_DEFAULT}") endif() add_compile_definitions(HIGHFIVE_CXX_STD=${CMAKE_CXX_STANDARD})