diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake index 7a84a01d9..8b56cc782 100644 --- a/cmake/EthDependencies.cmake +++ b/cmake/EthDependencies.cmake @@ -34,10 +34,11 @@ set(BOOST_COMPONENTS "filesystem;unit_test_framework;program_options;system") if (WIN32) # Boost 1.77 fixes a bug that causes crashes on Windows for some relative paths in --allow-paths. # See https://github.com/boostorg/filesystem/issues/201 - find_package(Boost 1.77.0 QUIET REQUIRED COMPONENTS ${BOOST_COMPONENTS}) + # Boost 1.78 requires upgrading to MSVC2022, and causes issues with boost::filesystem calls. + find_package(Boost 1.77.0 EXACT QUIET REQUIRED COMPONENTS ${BOOST_COMPONENTS}) else() - # Boost 1.65 is the first to also provide boost::get for rvalue-references (#5787). - find_package(Boost 1.65.0 QUIET REQUIRED COMPONENTS ${BOOST_COMPONENTS}) + + find_package(Boost 1.74.0 QUIET REQUIRED COMPONENTS ${BOOST_COMPONENTS}) endif() # If cmake is older than boost and boost is older than 1.70, diff --git a/libsolutil/Common.h b/libsolutil/Common.h index 5c7814613..eea9dacd5 100644 --- a/libsolutil/Common.h +++ b/libsolutil/Common.h @@ -41,9 +41,6 @@ #include #include -#if (BOOST_VERSION < 106500) -#error "Unsupported Boost version. At least 1.65 required." -#endif #include #include diff --git a/libsolutil/Numeric.h b/libsolutil/Numeric.h index c0f33e490..be9f0bea2 100644 --- a/libsolutil/Numeric.h +++ b/libsolutil/Numeric.h @@ -25,9 +25,6 @@ #include #include -#if (BOOST_VERSION < 106500) -#error "Unsupported Boost version. At least 1.65 required." -#endif // TODO: do this only conditionally as soon as a boost version with gcc 12 support is released. #if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ >= 12)