diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d4f40f..42664da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,6 +53,7 @@ add_library(FairLogger logger/Logger.cxx logger/Logger.h ) +target_compile_features(FairLogger PUBLIC cxx_std_11) if(USE_BOOST_PRETTY_FUNCTION) target_link_libraries(FairLogger PUBLIC Boost::boost) @@ -67,6 +68,7 @@ else() $ $ ) + target_compile_features(fmt PUBLIC cxx_std_11) target_compile_definitions(fmt INTERFACE FMT_HEADER_ONLY) target_link_libraries(FairLogger PUBLIC fmt) endif() diff --git a/cmake/FairLoggerLib.cmake b/cmake/FairLoggerLib.cmake index 09c84f4..11edab9 100644 --- a/cmake/FairLoggerLib.cmake +++ b/cmake/FairLoggerLib.cmake @@ -95,13 +95,9 @@ macro(set_fairlogger_defaults) # Handle C++ standard level set(PROJECT_MIN_CXX_STANDARD 11) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - if(NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD ${PROJECT_MIN_CXX_STANDARD}) - elseif(${CMAKE_CXX_STANDARD} LESS ${PROJECT_MIN_CXX_STANDARD}) + if(CMAKE_CXX_STANDARD LESS PROJECT_MIN_CXX_STANDARD) message(FATAL_ERROR "A minimum CMAKE_CXX_STANDARD of ${PROJECT_MIN_CXX_STANDARD} is required.") endif() - set(CMAKE_CXX_EXTENSIONS OFF) # Generate compile_commands.json file (https://clang.llvm.org/docs/JSONCompilationDatabase.html) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)