Skip to content
Merged
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
4 changes: 3 additions & 1 deletion libraries.cmake/boost.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ MACRO( OPENMS_CONTRIB_BUILD_BOOST)

# use proper toolchain (random guesses. There is not proper documentation)
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
# Modern Clang chokes on boost 1.78 unless we pass this (https://github.com/boostorg/mpl/issues/74)
set(BOOST_EXTRA_CXXFLAGS "-Wno-enum-constexpr-conversion")
# since around boost 1.70 there is not bootstrap toolset called darwin anymore
set(_boost_bootstrap_toolchain "clang")
if(APPLE)
Expand Down Expand Up @@ -163,7 +165,7 @@ MACRO( OPENMS_CONTRIB_BUILD_BOOST)
set(BOOST_DEBUG_FLAGS "--debug-configuration -d+2")
endif()
# boost cmd (use b2 since sometimes the copying/symlinking from b2 to bjam fails)
set (BOOST_CMD "./b2 ${BOOST_DEBUG_FLAGS} architecture=x86 toolset=${_boost_toolchain} -j ${NUMBER_OF_JOBS} --disable-icu link=${BOOST_BUILD_TYPE} cxxflags=-fPIC ${OSX_LIB_FLAG} ${OSX_DEPLOYMENT_FLAG} ${BOOST_LINKER_FLAGS} install --build-type=complete --layout=tagged --threading=single,multi")
set (BOOST_CMD "./b2 ${BOOST_DEBUG_FLAGS} architecture=x86 toolset=${_boost_toolchain} -j ${NUMBER_OF_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}) ...")
Expand Down
Loading