diff --git a/CMakeLists.txt b/CMakeLists.txt index 04d3c58a..e6af5d6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,11 +18,7 @@ get_git_version() project(FairMQ VERSION ${PROJECT_VERSION} LANGUAGES CXX) message(STATUS "${BWhite}${PROJECT_NAME}${CR} ${PROJECT_GIT_VERSION} from ${PROJECT_DATE}") -if(BUILD_OFI_TRANSPORT OR BUILD_SDK OR BUILD_PMIX_PLUGIN) - set(PROJECT_MIN_CXX_STANDARD 14) -else() - set(PROJECT_MIN_CXX_STANDARD 11) -endif() +set(PROJECT_MIN_CXX_STANDARD 17) set_fairmq_defaults() @@ -262,7 +258,7 @@ install_cmake_package() # Summary ###################################################################### message(STATUS " ") -message(STATUS " ${Cyan}CXX STANDARD${CR} ${BGreen}C++${CMAKE_CXX_STANDARD}${CR} (>= C++${PROJECT_MIN_CXX_STANDARD}, change with ${BMagenta}-DCMAKE_CXX_STANDARD=17${CR})") +message(STATUS " ${Cyan}CXX STANDARD${CR} ${BGreen}C++${CMAKE_CXX_STANDARD}${CR} (>= C++${PROJECT_MIN_CXX_STANDARD}, change with ${BMagenta}-DCMAKE_CXX_STANDARD=20${CR})") if(CMAKE_CXX_FLAGS) message(STATUS " ") message(STATUS " ${Cyan}GLOBAL CXX FLAGS${CR} ${BGreen}${CMAKE_CXX_FLAGS}${CR}") @@ -365,9 +361,9 @@ else() endif() message(STATUS " ${BWhite}tests${CR} ${tests_summary}") if(BUILD_OFI_TRANSPORT) - set(ofi_summary "${BGreen}YES${CR} EXPERIMENTAL (requires C++14) (disable with ${BMagenta}-DBUILD_OFI_TRANSPORT=OFF${CR})") + set(ofi_summary "${BGreen}YES${CR} EXPERIMENTAL (disable with ${BMagenta}-DBUILD_OFI_TRANSPORT=OFF${CR})") else() - set(ofi_summary "${BRed} NO${CR} EXPERIMENTAL (requires C++14) (default, enable with ${BMagenta}-DBUILD_OFI_TRANSPORT=ON${CR})") + set(ofi_summary "${BRed} NO${CR} EXPERIMENTAL (default, enable with ${BMagenta}-DBUILD_OFI_TRANSPORT=ON${CR})") endif() message(STATUS " ${BWhite}ofi_transport${CR} ${ofi_summary}") if(BUILD_DDS_PLUGIN) @@ -377,9 +373,9 @@ else() endif() message(STATUS " ${BWhite}dds_plugin${CR} ${dds_summary}") if(BUILD_PMIX_PLUGIN) - set(pmix_summary "${BGreen}YES${CR} EXPERIMENTAL (requires C++14) (disable with ${BMagenta}-DBUILD_PMIX_PLUGIN=OFF${CR})") + set(pmix_summary "${BGreen}YES${CR} EXPERIMENTAL (disable with ${BMagenta}-DBUILD_PMIX_PLUGIN=OFF${CR})") else() - set(pmix_summary "${BRed} NO${CR} EXPERIMENTAL (requires C++14) (default, enable with ${BMagenta}-DBUILD_PMIX_PLUGIN=ON${CR})") + set(pmix_summary "${BRed} NO${CR} EXPERIMENTAL (default, enable with ${BMagenta}-DBUILD_PMIX_PLUGIN=ON${CR})") endif() message(STATUS " ${BWhite}pmix_plugin${CR} ${pmix_summary}") if(BUILD_EXAMPLES) @@ -395,9 +391,9 @@ else() endif() message(STATUS " ${BWhite}docs${CR} ${docs_summary}") if(BUILD_SDK) - set(sdk_summary "${BGreen}YES${CR} EXPERIMENTAL (required C++14) (disable with ${BMagenta}-DBUILD_SDK=OFF${CR})") + set(sdk_summary "${BGreen}YES${CR} EXPERIMENTAL (disable with ${BMagenta}-DBUILD_SDK=OFF${CR})") else() - set(sdk_summary "${BRed} NO${CR} EXPERIMENTAL (required C++14) (default, enable with ${BMagenta}-DBUILD_SDK=ON${CR})") + set(sdk_summary "${BRed} NO${CR} EXPERIMENTAL (default, enable with ${BMagenta}-DBUILD_SDK=ON${CR})") endif() message(STATUS " ${BWhite}sdk${CR} ${sdk_summary}") if(BUILD_SDK_COMMANDS)