Merge pull request OpenMS#7547 from cbielow/boost174

up minimal boost version to 1.74
cbielow · Jul 13, 2024 · c1dccb3 · c1dccb3
2 parents 1b53f66 + 66e4d60
commit c1dccb3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 35 deletions.
diff --git a/cmake/build_system_macros.cmake b/cmake/build_system_macros.cmake
@@ -60,35 +60,9 @@ macro(find_boost)
     "1.77.1" "1.77.0" "1.77"
     "1.76.1" "1.76.0" "1.76"
     "1.75.1" "1.75.0" "1.75"
-    "1.74.1" "1.74.0" "1.74"
-    "1.73.1" "1.73.0" "1.73"
-    "1.72.1" "1.72.0" "1.72"
-    "1.71.1" "1.71.0" "1.71"
-    "1.70.1" "1.70.0" "1.70"
-    "1.69.1" "1.69.0" "1.69"
-    "1.68.1" "1.68.0" "1.68"
-    "1.67.1" "1.67.0" "1.67"
-    "1.66.1" "1.66.0" "1.66"
-    "1.65.1" "1.65.0" "1.65"
-    "1.64.1" "1.64.0" "1.64"
-    "1.63.1" "1.63.0" "1.63"
-    "1.62.1" "1.62.0" "1.62"
-    "1.61.1" "1.61.0" "1.61"
-    "1.60.1" "1.60.0" "1.60"
-    "1.59.1" "1.59.0" "1.59"
-    "1.58.1" "1.58.0" "1.58"
-    "1.57.1" "1.57.0" "1.57"
-    "1.56.1" "1.56.0" "1.56"
-    "1.55.1" "1.55.0" "1.55"
-    "1.54.1" "1.54.0" "1.54"
-    "1.53.1" "1.53.0" "1.53"
-    "1.52.1" "1.52.0" "1.52"
-    "1.51.1" "1.51.0" "1.51"
-    "1.50.1" "1.50.0" "1.50"
-    "1.49.1" "1.49.0" "1.49"
-    "1.48.1" "1.48.0" "1.48")
+    "1.74.1" "1.74.0" "1.74")
 
-  find_package(Boost 1.48.0 COMPONENTS ${ARGN} REQUIRED)
+  find_package(Boost 1.74.0 COMPONENTS ${ARGN} REQUIRED)
 
 endmacro(find_boost)
 

diff --git a/cmake/cmake_findExternalLibs.cmake b/cmake/cmake_findExternalLibs.cmake
@@ -200,12 +200,6 @@ ELSE()
 ENDIF()
 
 
-
-# see https://github.com/ethereum/solidity/issues/4124
-if("${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}" VERSION_LESS "1.59")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT")
-endif()
-
 #------------------------------------------------------------------------------
 # PTHREAD
 #------------------------------------------------------------------------------

diff --git a/doc/doxygen/install/install-linux.doxygen b/doc/doxygen/install/install-linux.doxygen
@@ -53,7 +53,7 @@
     </li>
     <li>
       For the complete feature set to be enabled, %OpenMS needs recent versions of
-      \b Boost (>= 1.48), \b Eigen3 (>= 3.3.2), \b libHDF5, \b libSVM (2.91 or higher but not 3.15),
+      \b Boost (>= 1.74), \b Eigen3 (>= 3.4.0), \b libHDF5, \b libSVM (2.91 or higher but not 3.15),
       \b glpk (>= 4.45) or \b CoinMP (>= 1.3.3), \b zlib, \b libbz2, and \b Xerces-C (>= 3.1.1).
       These should be built by our contrib build script in case they are not already installed via your package manager.
     </li>