From db19c323819d8065dabd3a96d2192cead02710e1 Mon Sep 17 00:00:00 2001 From: orignal Date: Wed, 18 Sep 2024 15:42:30 -0400 Subject: [PATCH] require minimal boost 1.83 for c++20 --- build/CMakeLists.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index 19c51dfd..415a45da 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -125,6 +125,11 @@ if(WIN32) endif() +find_package(Boost REQUIRED COMPONENTS system filesystem program_options) +if(NOT DEFINED Boost_FOUND) + message(SEND_ERROR "Boost is not found, or your boost version was below 1.46. Please download Boost!") +endif() + if(WITH_UPNP) add_definitions(-DUSE_UPNP) endif() @@ -157,10 +162,12 @@ else() set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -ffunction-sections -fdata-sections") set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "-Wl,--gc-sections") # -flto is added from above - # check for с++20 & c++17 support + # check for c++20 & c++17 support include(CheckCXXCompilerFlag) - CHECK_CXX_COMPILER_FLAG("-std=c++20" CXX20_SUPPORTED) + if(Boost_VERSION VERSION_GREATER_EQUAL "1.83") # min boost version for c++20 + CHECK_CXX_COMPILER_FLAG("-std=c++20" CXX20_SUPPORTED) + endif() CHECK_CXX_COMPILER_FLAG("-std=c++17" CXX17_SUPPORTED) @@ -285,11 +292,6 @@ else() endif() endif() -find_package(Boost REQUIRED COMPONENTS system filesystem program_options OPTIONAL_COMPONENTS atomic) -if(NOT DEFINED Boost_FOUND) - message(SEND_ERROR "Boost is not found, or your boost version was below 1.46. Please download Boost!") -endif() - find_package(OpenSSL REQUIRED) if(NOT DEFINED OPENSSL_FOUND) message(SEND_ERROR "Could not find OpenSSL. Please download and install it first!")