Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ set (PATCH_DIR "${PROJECT_SOURCE_DIR}/patches/" CACHE STRING "Directory containi
## Warning: ensure these are all upper-case names!
set(BZIP2_DIR ${CONTRIB_BIN_SOURCE_DIR}/bzip2-1.0.5)
set(ZLIB_DIR ${CONTRIB_BIN_SOURCE_DIR}/zlib-1.3.1)
set(BOOST_DIR ${CONTRIB_BIN_SOURCE_DIR}/boost-1.81.0)
set(BOOST_DIR ${CONTRIB_BIN_SOURCE_DIR}/boost-1.87.0)
set(XERCES_DIR ${CONTRIB_BIN_SOURCE_DIR}/Xerces-C_3_2_0)
set(LIBSVM_DIR ${CONTRIB_BIN_SOURCE_DIR}/libsvm-3.12)
set(GLPK_DIR ${CONTRIB_BIN_SOURCE_DIR}/glpk-4.46)
Expand Down Expand Up @@ -223,9 +223,9 @@ set(ARCHIVE_ZLIB zlib-1.3.1.tar.gz)
set(ARCHIVE_ZLIB_TAR zlib-1.3.1.tar)
set(ARCHIVE_ZLIB_SHA256 "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23")

set(ARCHIVE_BOOST boost-1.81.0.tar.gz)
set(ARCHIVE_BOOST_TAR boost-1.81.0.tar)
set(ARCHIVE_BOOST_SHA256 "121da556b718fd7bd700b5f2e734f8004f1cfa78b7d30145471c526ba75a151c")
set(ARCHIVE_BOOST boost-1.87.0.tar.gz)
set(ARCHIVE_BOOST_TAR boost-1.87.0.tar)
set(ARCHIVE_BOOST_SHA256 "f55c340aa49763b1925ccf02b2e83f35fdcf634c9d5164a2acb87540173c741d")

set(ARCHIVE_XERCES Xerces-C_3_2_0.tar.gz)
set(ARCHIVE_XERCES_TAR Xerces-C_3_2_0.tar)
Expand Down
6 changes: 3 additions & 3 deletions libraries.cmake/boost.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,11 @@ MACRO( OPENMS_CONTRIB_BUILD_BOOST)

# boost cmd (use b2 since sometimes the copying/symlinking from b2 to bjam fails)
set (BOOST_CMD "./b2 ${BOOST_DEBUG_FLAGS} ${BOOST_ARCHITECTURE} toolset=${_boost_toolchain} -j ${_BOOST_PARALLEL_JOBS} --disable-icu link=${BOOST_BUILD_TYPE} cxxflags=-fPIC ${BOOST_EXTRA_CXXFLAGS} ${OSX_LIB_FLAG} ${OSX_DEPLOYMENT_FLAG} ${BOOST_LINKER_FLAGS} install --build-type=complete --layout=tagged --threading=single,multi")

# boost install
message(STATUS "Installing Boost libraries (${BOOST_CMD}) ...")
execute_process(COMMAND ./b2 ${BOOST_DEBUG_FLAGS} ${BOOST_ARCHITECTURE} toolset=${_boost_toolchain}
-j ${_BOOST_PARALLEL_JOBS}
execute_process(COMMAND ./b2 ${BOOST_DEBUG_FLAGS} ${BOOST_ARCHITECTURE} toolset=${_boost_toolchain}
-j ${_BOOST_PARALLEL_JOBS}
--disable-icu
-s NO_LZMA=1
-s NO_ZSTD=1
Expand Down
Loading