Skip to content
Snippets Groups Projects
Unverified Commit eb9e9d15 authored by Lars Bilke's avatar Lars Bilke
Browse files

[cmake] Update Boost to 1.82

Uses full sources instead of subset. Download is 90 MB.
parent 2344e80b
No related branches found
No related tags found
No related merge requests found
...@@ -4,6 +4,9 @@ cmake_minimum_required(VERSION 3.22) ...@@ -4,6 +4,9 @@ cmake_minimum_required(VERSION 3.22)
if(CMAKE_VERSION GREATER_EQUAL 3.29) if(CMAKE_VERSION GREATER_EQUAL 3.29)
cmake_policy(SET CMP0156 NEW) cmake_policy(SET CMP0156 NEW)
endif() endif()
if(CMAKE_VERSION GREATER_EQUAL 3.30)
cmake_policy(SET CMP0167 NEW)
endif()
project(OGS-6) project(OGS-6)
......
...@@ -190,20 +190,16 @@ if(OGS_USE_MFRONT) ...@@ -190,20 +190,16 @@ if(OGS_USE_MFRONT)
endif() endif()
endif() endif()
CPMFindPackage( if(GUIX_BUILD)
NAME Boost find_package(Boost REQUIRED)
VERSION ${ogs.minimum_version.boost}
URL https://gitlab.opengeosys.org/ogs/libs/boost-subset/-/jobs/303158/artifacts/raw/ogs-boost-${ogs.minimum_version.boost}.tar.gz
SYSTEM TRUE
)
if(Boost_ADDED)
add_library(Boost::boost INTERFACE IMPORTED)
target_include_directories(
Boost::boost SYSTEM INTERFACE "${Boost_SOURCE_DIR}"
)
else() else()
target_include_directories( CPMFindPackage(
Boost::boost SYSTEM INTERFACE "${Boost_INCLUDE_DIR}" NAME Boost
VERSION ${ogs.minimum_version.boost}
URL https://github.com/boostorg/boost/releases/download/boost-${ogs.minimum_version.boost}/boost-${ogs.minimum_version.boost}.tar.xz
OPTIONS
"BOOST_ENABLE_CMAKE ON"
"BOOST_INCLUDE_LIBRARIES algorithm\\\;math\\\;multi_index\\\;property_tree\\\;smart_ptr"
) )
endif() endif()
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
"git": "2.14", "git": "2.14",
"cmake": "3.22", "cmake": "3.22",
"hugo": "0.122.0", "hugo": "0.122.0",
"boost": "1.73.0", "boost": "1.82.0",
"eigen": "3.4.0", "eigen": "3.4.0",
"eigen-unsupported": "9000b3767770f6dd0f4cfb12f4e19c71921885a4", "eigen-unsupported": "9000b3767770f6dd0f4cfb12f4e19c71921885a4",
"vtk": "9.3.0", "vtk": "9.3.0",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment