Skip to content

Commit

Permalink
Update boost dependency (#1564)
Browse files Browse the repository at this point in the history
Use newer boost v 1.82.0
Remove workaround in compilation.
Add boost submodules needed by 1.82 boost.

Relates-To: DATASDK-52

Signed-off-by: Yaroslav Stefinko <ext-yaroslav.stefinko@here.com>
  • Loading branch information
ystefinko authored Nov 15, 2024
1 parent 0cd2288 commit 37d5698
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ The table below lists the dependencies of the Data SDK.
|:---------------------|:--------------------|
| Libcurl | 7.52.1 |
| OpenSSL | 1.1.1w |
| Boost (headers only) | 1.72.0 |
| Boost (headers only) | 1.82.0 |
| LevelDB | 1.21 |
| Snappy | 1.1.7 |
| RapidJSON | latest |
Expand Down
2 changes: 1 addition & 1 deletion external/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ set(OLP_SDK_CPP_RAPIDJSON_URL "https://github.com/Tencent/rapidjson.git")
set(OLP_SDK_CPP_RAPIDJSON_TAG "master")

set(OLP_SDK_CPP_BOOST_URL "https://github.com/boostorg/boost.git")
set(OLP_SDK_CPP_BOOST_TAG "boost-1.72.0")
set(OLP_SDK_CPP_BOOST_TAG "boost-1.82.0")

set(OLP_SDK_CPP_LMDB_URL "https://github.com/LMDB/lmdb.git")
set(OLP_SDK_CPP_LMDB_TAG "LMDB_0.9.29")
Expand Down
2 changes: 2 additions & 0 deletions external/boost/CMakeLists.txt.boost.in
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ ExternalProject_Add(boost-download
libs/container_hash
libs/core
libs/detail
libs/describe
libs/format
libs/function_types
libs/headers
Expand All @@ -38,6 +39,7 @@ ExternalProject_Add(boost-download
libs/iterator
libs/move
libs/mpl
libs/mp11
libs/numeric/conversion
libs/optional
libs/predef
Expand Down
1 change: 0 additions & 1 deletion scripts/macos/psv/azure_macos_build_psv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
mkdir -p build
cd build
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-DCMAKE_CXX_FLAGS="-Wno-deprecated-builtins -Wno-deprecated-declarations -Wno-deprecated-copy" \
-DOLP_SDK_BUILD_EXAMPLES=ON \
-DBUILD_SHARED_LIBS=ON \
-DOLP_SDK_ENABLE_TESTING=NO \
Expand Down

0 comments on commit 37d5698

Please sign in to comment.