Skip to content

Commit

Permalink
Fix boost dependency url.
Browse files Browse the repository at this point in the history
Original host's lifetime has ended, see here: boostorg/boost#502
This is PR #6349, amended by @lukasmatena who added the changes for platforms other than Windows.
  • Loading branch information
cp authored and lukasmatena committed Apr 13, 2021
1 parent e864312 commit 2791139
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions deps/deps-linux.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ include("deps-unix-common.cmake")

ExternalProject_Add(dep_boost
EXCLUDE_FROM_ALL 1
URL "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.gz"
URL "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz"
URL_HASH SHA256=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ./bootstrap.sh
Expand Down Expand Up @@ -100,5 +100,5 @@ ExternalProject_Add(dep_libcurl
BUILD_COMMAND make "-j${NPROC}"
INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
)

add_dependencies(dep_openvdb dep_boost)

4 changes: 2 additions & 2 deletions deps/deps-macos.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ include("deps-unix-common.cmake")

ExternalProject_Add(dep_boost
EXCLUDE_FROM_ALL 1
URL "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.gz"
URL "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz"
URL_HASH SHA256=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ./bootstrap.sh
Expand Down Expand Up @@ -87,5 +87,5 @@ ExternalProject_Add(dep_libcurl
BUILD_COMMAND make "-j${NPROC}"
INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
)
add_dependencies(dep_openvdb dep_boost)

add_dependencies(dep_openvdb dep_boost)
5 changes: 3 additions & 2 deletions deps/deps-mingw.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include("deps-unix-common.cmake")

ExternalProject_Add(dep_boost
EXCLUDE_FROM_ALL 1
URL "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.gz"
URL "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz"
URL_HASH SHA256=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND bootstrap.bat
Expand Down Expand Up @@ -58,4 +58,5 @@ ExternalProject_Add(dep_libcurl
-DCURL_DISABLE_GOPHER=ON
-DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
${DEP_CMAKE_OPTS}
)
)

5 changes: 3 additions & 2 deletions deps/deps-windows.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ endmacro()

ExternalProject_Add(dep_boost
EXCLUDE_FROM_ALL 1
URL "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.gz"
URL "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz"
URL_HASH SHA256=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND bootstrap.bat
Expand Down Expand Up @@ -295,4 +295,5 @@ if (${DEP_DEBUG})
COMMAND msbuild /m /P:Configuration=Debug INSTALL.vcxproj
WORKING_DIRECTORY "${BINARY_DIR}"
)
endif ()
endif ()

0 comments on commit 2791139

Please sign in to comment.