update boost installation

drexlerd · Jan 13, 2024 · 44f6716 · 44f6716
1 parent eabfcb1
commit 44f6716
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Config.cmake.in b/Config.cmake.in
@@ -19,7 +19,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/cmake/configure_boost.cmake")
 # Boost
 # Find Boost headers only according to https://cmake.org/cmake/help/latest/module/FindBoost.html
 configure_boost()
-find_dependency(Boost ${BOOST_MIN_VERSION} REQUIRED PATHS "${PACKAGE_PREFIX_DIR}/boost/lib/cmake/config")
+find_dependency(Boost ${BOOST_MIN_VERSION} REQUIRED PATHS "${PACKAGE_PREFIX_DIR}/boost")
 
 if(Boost_FOUND)
   include_directories(${Boost_INCLUDE_DIRS})

diff --git a/dependencies/boost/CMakeLists.txt b/dependencies/boost/CMakeLists.txt
@@ -5,13 +5,13 @@ include(ExternalProject)
 
 message(STATUS "Preparing external project \"loki_boost\":")
 
+# We need to build boost for cmake support
 ExternalProject_Add(
     loki_boost
     URL https://archives.boost.io/release/1.84.0/source/boost_1_84_0.tar.gz
     PREFIX ${CMAKE_BINARY_DIR}/boost
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/boost ${CMAKE_INSTALL_PREFIX}/boost/include/boost
-            COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/tools/cmake ${CMAKE_INSTALL_PREFIX}/boost/lib/cmake
-    UPDATE_DISCONNECTED 1
+    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> ./bootstrap.sh --prefix=<INSTALL_DIR>
+    BUILD_COMMAND ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> ./b2 headers
+    INSTALL_COMMAND ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> ./b2 install
+    INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/boost
 )