guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-04 07:11:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve boost configuration

Browse source
This commit is contained in:
Guilhem Lavaux 2021-04-15 15:00:05 +02:00
parent e84b6de89e
commit f7df64c768
2 changed files with 53 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
external/configure_boost.cmake vendored Normal file
View file

@ -0,0 +1,17 @@
MESSAGE(STATUS "Reconfiguring using compiler flags=\"${COMPILER_EXTRA_FLAGS}\" and linker flags=\"${LINKER_EXTRA_FLAGS}\"")
FILE(WRITE ${SRC_DIR}/tools/build/src/user-config.jam
"using ${TOOLSET} : cmake : \"${COMPILER}\" : <cxxflags>\"${COMPILER_EXTRA_FLAGS}\" <linkflags>\"${LINKER_EXTRA_FLAGS}\" ;\n"
)
#FILE(APPEND ${SRC_DIR}/boost/regex/user.hpp
# "#define BOOST_REGEX_MATCH_EXTRA 1\n"
#)
execute_process(
COMMAND "${SRC_DIR}/bootstrap.sh" --prefix=${INSTALL_PATH} toolset=${TOOLSET}-cmake
RESULT_VARIABLE okcode
)
IF (NOT "${okcode}" STREQUAL "0")
MESSAGE(FATAL_ERROR "Cannot execute configure command")
ENDIF()

41
external/external_build.cmake vendored
View file

@ -39,10 +39,10 @@ IF(INTERNAL_NETCDF)
ENDIF(INTERNAL_NETCDF) ENDIF(INTERNAL_NETCDF)
IF(INTERNAL_BOOST) IF(INTERNAL_BOOST)
SET(BOOST_URL "http://sourceforge.net/projects/boost/files/boost/1.69.0/boost_1_69_0.tar.gz/download" CACHE STRING "URL to download Boost from") SET(BOOST_URL "https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.tar.gz" CACHE STRING "URL to download Boost from")
mark_as_advanced(BOOST_URL) mark_as_advanced(BOOST_URL)
ELSE(INTERNAL_BOOST) ELSE(INTERNAL_BOOST)
find_package(Boost 1.69.0 COMPONENTS format spirit phoenix python FATAL_ERROR) find_package(Boost 1.74.0 COMPONENTS format spirit phoenix python FATAL_ERROR)
ENDIF(INTERNAL_BOOST) ENDIF(INTERNAL_BOOST)
IF(INTERNAL_QHULL) IF(INTERNAL_QHULL)
@ -202,13 +202,44 @@ mark_as_advanced(NETCDF_LIBRARY NETCDFCPP_LIBRARY NETCDF_INCLUDE_PATH NETCDFCPP_
if (INTERNAL_BOOST) if (INTERNAL_BOOST)
SET(cosmotool_DEPS ${cosmotool_DEPS} boost) SET(cosmotool_DEPS ${cosmotool_DEPS} boost)
SET(BOOST_SOURCE_DIR ${BUILD_PREFIX}/boost-prefix/src/boost) SET(BOOST_SOURCE_DIR ${BUILD_PREFIX}/boost-prefix/src/boost)
set(LINKER_EXTRA_FLAGS)
message(STATUS "Compiler version is ${CMAKE_CXX_COMPILER_VERSION}")
string(REGEX REPLACE "^([0-9]+\\.[0-9]+).*$" "\\1" ToolsetVer "${CMAKE_CXX_COMPILER_VERSION}")
IF(CMAKE_CXX_COMPILER_ID MATCHES "^Intel$")
SET(b2_toolset intel)
SET(COMPILER_EXTRA_FLAGS "-fPIC")
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
SET(b2_toolset darwin)
else()
SET(b2_toolset gcc)
SET(COMPILER_EXTRA_FLAGS "-fPIC -std=gnu++14")
endif()
add_definitions("-Wno-unused-local-typedefs")
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
SET(b2_toolset darwin)
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
SET(b2_toolset clang)
endif()
SET(COMPILER_EXTRA_FLAGS "${COMPILER_EXTRA_FLAGS} -I${EXT_INSTALL}/include")
SET(LINKER_EXTRA_FLAGS "${LINKER_EXTRA_FLAGS} -L${EXT_INSTALL}/lib")
message(STATUS "Building boost with toolset ${b2_toolset}")
SET(BOOST_LIBRARIES
${EXT_INSTALL}/lib/libboost_exception.a
)
ExternalProject_Add(boost ExternalProject_Add(boost
URL ${BOOST_URL} URL ${BOOST_URL}
URL_HASH SHA1=107cebeec706988639cf2932fc0ce43200de4c0a
PREFIX ${BUILD_PREFIX}/boost-prefix PREFIX ${BUILD_PREFIX}/boost-prefix
CONFIGURE_COMMAND ${BOOST_SOURCE_DIR}/bootstrap.sh --prefix=${EXT_INSTALL} CONFIGURE_COMMAND ${CMAKE_COMMAND} -DTOOLSET=${b2_toolset} "-DCOMPILER:STRING=${CMAKE_CXX_COMPILER}" "-DCOMPILER_EXTRA_FLAGS=${COMPILER_EXTRA_FLAGS}" "-DINSTALL_PATH:STRING=${EXT_INSTALL}" "-DLINKER_EXTRA_FLAGS=${LINKER_EXTRA_FLAGS}" "-DSRC_DIR:STRING=${BOOST_SOURCE_DIR}" -P ${CMAKE_SOURCE_DIR}/external/configure_boost.cmake
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND ${BOOST_SOURCE_DIR}/b2 --with-exception BUILD_COMMAND ${BOOST_SOURCE_DIR}/b2 --with-exception toolset=${b2_toolset}-cmake variant=release
INSTALL_COMMAND ${BOOST_SOURCE_DIR}/b2 install --with-exception INSTALL_COMMAND ${BOOST_SOURCE_DIR}/b2 install --with-exception
BUILD_BYPRODUCTS ${BOOST_LIBRARIES}
) )
set(Boost_INCLUDE_DIRS ${BOOST_SOURCE_DIR} CACHE STRING "Boost path" FORCE) set(Boost_INCLUDE_DIRS ${BOOST_SOURCE_DIR} CACHE STRING "Boost path" FORCE)
set(Boost_INTERNAL_INSTALL ${EXT_INSTALL}) set(Boost_INTERNAL_INSTALL ${EXT_INSTALL})