Skip to content

Commit

Permalink
Update Boost to 1.86
Browse files Browse the repository at this point in the history
  • Loading branch information
rickertm committed Sep 8, 2024
1 parent 932ad01 commit 4f8d72a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 16 deletions.
8 changes: 1 addition & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ if(NOT DEFINED CPACK_INSTALL_CMAKE_PROJECTS)
set(
CPACK_INSTALL_CMAKE_PROJECTS
${CMAKE_CURRENT_BINARY_DIR}/atidaq/atidaq-prefix/src/atidaq-build atidaq ALL /
${CMAKE_CURRENT_BINARY_DIR}/boost/boost-prefix/src/boost-build boost ALL /
${CMAKE_CURRENT_BINARY_DIR}/bullet3/bullet3-prefix/src/bullet3-build bullet3 ALL /
${CMAKE_CURRENT_BINARY_DIR}/coin/coin-prefix/src/coin-build coin ALL /
${CMAKE_CURRENT_BINARY_DIR}/eigen3/eigen3-prefix/src/eigen3-build eigen3 ALL /
Expand Down Expand Up @@ -90,13 +91,6 @@ if(NOT DEFINED CPACK_INSTALL_CMAKE_PROJECTS)
endif()
endif()

if(NOT DEFINED CPACK_INSTALLED_DIRECTORIES)
set(
CPACK_INSTALLED_DIRECTORIES
${CMAKE_CURRENT_BINARY_DIR}/boost/boost-prefix/src/boost/boost ${CMAKE_INSTALL_INCLUDEDIR}/boost
)
endif()

file(TO_CMAKE_PATH "${CPACK_INSTALLED_DIRECTORIES}" CPACK_INSTALLED_DIRECTORIES)

if(MSVC)
Expand Down
20 changes: 11 additions & 9 deletions boost/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
ExternalProject_Add(
boost
URL
https://sourceforge.net/projects/boost/files/boost/1.84.0/boost_1_84_0.7z/download
https://boostorg.jfrog.io/artifactory/main/release/1.84.0/source/boost_1_84_0.7z
#URL ${CMAKE_CURRENT_SOURCE_DIR}/boost_1_84_0.7z
URL_MD5 540062a1e7573bb26768e50c20e7e5c7
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
BUILD_IN_SOURCE 1
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/boost ${CMAKE_INSTALL_FULL_INCLUDEDIR}/boost
URL https://github.com/boostorg/boost/releases/download/boost-1.86.0/boost-1.86.0-cmake.7z
#URL ${CMAKE_CURRENT_SOURCE_DIR}/boost-1.86.0-cmake.7z
URL_MD5 c33bf9137ff5ff1d3d0f28af212c9704
CMAKE_ARGS
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_CFG_INTDIR=${CMAKE_CFG_INTDIR}
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
-DCMAKE_TRY_COMPILE_CONFIGURATION=${CMAKE_TRY_COMPILE_CONFIGURATION}
INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
)

ExternalProject_Add_Step(
Expand Down

0 comments on commit 4f8d72a

Please # to comment.