From 31228ce54ae02cdaaf29b6d602d3fd79d3767030 Mon Sep 17 00:00:00 2001 From: Rashad Kanavath <rashad.kanavath@c-s.fr> Date: Wed, 5 Oct 2016 10:26:25 +0200 Subject: [PATCH] SuperBuild: shark 3.1.3 tag uses more boost components --- SuperBuild/CMake/External_boost.cmake | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/SuperBuild/CMake/External_boost.cmake b/SuperBuild/CMake/External_boost.cmake index 16fc0ed1e0..a2e8b20659 100644 --- a/SuperBuild/CMake/External_boost.cmake +++ b/SuperBuild/CMake/External_boost.cmake @@ -18,7 +18,7 @@ set(BOOST_SB_CONFIG ${BOOST_SB_CONFIG} variant=release link=shared - threading=single + threading=multi runtime-link=shared --prefix=${SB_INSTALL_PREFIX} --includedir=${_SB_Boost_INCLUDE_DIR} @@ -28,6 +28,9 @@ set(BOOST_SB_CONFIG --with-serialization --with-filesystem --with-test + --with-date_time + --with-program_options + --with-thread -d0 ) @@ -46,12 +49,6 @@ set(BOOST_CONFIGURE_COMMAND ${CMAKE_COMMAND} ) set(BOOST_BUILD_COMMAND ${CMAKE_COMMAND} - -E chdir ${BOOST_SB_SRC} - ${BOOST_B2_EXE} - ${BOOST_SB_CONFIG} - ) - -set(BOOST_INSTALL_COMMAND ${CMAKE_COMMAND} -E chdir ${BOOST_SB_SRC} ${BOOST_B2_EXE} ${BOOST_SB_CONFIG} @@ -67,6 +64,6 @@ ExternalProject_Add(BOOST DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND} BUILD_COMMAND ${BOOST_BUILD_COMMAND} - INSTALL_COMMAND ${BOOST_INSTALL_COMMAND} + INSTALL_COMMAND "" ) -- GitLab