Dennis Klein 2021-03-22 06:03:48 +01:00 committed by Dennis Klein
parent 340b005997
commit 3f55a16850
2 changed files with 3 additions and 5 deletions

View File

@ -53,6 +53,7 @@ add_library(FairLogger
logger/Logger.cxx logger/Logger.cxx
logger/Logger.h logger/Logger.h
) )
target_compile_features(FairLogger PUBLIC cxx_std_11)
if(USE_BOOST_PRETTY_FUNCTION) if(USE_BOOST_PRETTY_FUNCTION)
target_link_libraries(FairLogger PUBLIC Boost::boost) target_link_libraries(FairLogger PUBLIC Boost::boost)
@ -67,6 +68,7 @@ else()
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/logger/bundled> $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/logger/bundled>
$<INSTALL_INTERFACE:${PROJECT_INSTALL_BUNDLEDINCDIR}> $<INSTALL_INTERFACE:${PROJECT_INSTALL_BUNDLEDINCDIR}>
) )
target_compile_features(fmt PUBLIC cxx_std_11)
target_compile_definitions(fmt INTERFACE FMT_HEADER_ONLY) target_compile_definitions(fmt INTERFACE FMT_HEADER_ONLY)
target_link_libraries(FairLogger PUBLIC fmt) target_link_libraries(FairLogger PUBLIC fmt)
endif() endif()

View File

@ -95,13 +95,9 @@ macro(set_fairlogger_defaults)
# Handle C++ standard level # Handle C++ standard level
set(PROJECT_MIN_CXX_STANDARD 11) set(PROJECT_MIN_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) if(CMAKE_CXX_STANDARD LESS PROJECT_MIN_CXX_STANDARD)
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD ${PROJECT_MIN_CXX_STANDARD})
elseif(${CMAKE_CXX_STANDARD} LESS ${PROJECT_MIN_CXX_STANDARD})
message(FATAL_ERROR "A minimum CMAKE_CXX_STANDARD of ${PROJECT_MIN_CXX_STANDARD} is required.") message(FATAL_ERROR "A minimum CMAKE_CXX_STANDARD of ${PROJECT_MIN_CXX_STANDARD} is required.")
endif() endif()
set(CMAKE_CXX_EXTENSIONS OFF)
# Generate compile_commands.json file (https://clang.llvm.org/docs/JSONCompilationDatabase.html) # Generate compile_commands.json file (https://clang.llvm.org/docs/JSONCompilationDatabase.html)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)