Commit 4ef61e04 authored by Michael Turner's avatar Michael Turner

boost compiler

parent e5c5f076
......@@ -89,7 +89,7 @@ IF (THIRDPARTY_BUILD_BOOST)
SET(TOOLSET msvc-14.0)
ENDIF()
ELSE()
SET(TOOLSET gcc)
SET(TOOLSET gcc-${CMAKE_CXX_COMPILER_VERSION})
ENDIF()
IF (NOT WIN32)
......@@ -104,13 +104,14 @@ IF (THIRDPARTY_BUILD_BOOST)
BINARY_DIR ${TPBUILD}/boost
TMP_DIR ${TPBUILD}/boost-tmp
INSTALL_DIR ${TPDIST}
CONFIGURE_COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ./bootstrap.sh --prefix=${TPDIST}
CONFIGURE_COMMAND ./bootstrap.sh
BUILD_COMMAND NO_BZIP2=1 ./b2
variant=release
link=shared
include=${TPDIST}/include
linkflags="-L${TPDIST}/lib"
${BOOST_FLAGS} ${BOOST_LIB_LIST}
--prefix=${TPDIST}
--layout=system toolset=${TOOLSET} install
INSTALL_COMMAND ""
)
......@@ -155,6 +156,15 @@ IF (THIRDPARTY_BUILD_BOOST)
DEPENDEES download)
ENDIF (APPLE)
SET(cmd_string "using gcc : ${CMAKE_CXX_COMPILER_VERSION} : ${CMAKE_CXX_COMPILER} \\\;")
IF (UNIX)
EXTERNALPROJECT_ADD_STEP(boost conf-project-conf
COMMAND cmake -E echo "${cmd_string}" > ${TPBUILD}/boost/project-config.jam
DEPENDERS build
DEPENDEES configure)
ENDIF()
# If building ThirdParty zlib, force zlib build before boost
IF (THIRDPARTY_BUILD_ZLIB)
ADD_DEPENDENCIES(boost zlib-1.2.7)
......@@ -191,4 +201,4 @@ ELSE (THIRDPARTY_BUILD_BOOST)
SET(Boost_CONFIG_LIBRARY_DIR ${Boost_LIBRARY_DIRS})
ENDIF (THIRDPARTY_BUILD_BOOST)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment