From 69263e7fa43aee89bb5673989116c110d97d78b4 Mon Sep 17 00:00:00 2001 From: Chris Cantwell Date: Sat, 1 Dec 2012 12:19:53 +0000 Subject: [PATCH] Updates to search for boost in environment BOOST_HOME. Disable use of multi-threaded boost. --- cmake/ThirdPartyBoost.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/ThirdPartyBoost.cmake b/cmake/ThirdPartyBoost.cmake index f1c6d76d9..ca398a25f 100644 --- a/cmake/ThirdPartyBoost.cmake +++ b/cmake/ThirdPartyBoost.cmake @@ -85,12 +85,14 @@ IF (THIRDPARTY_BUILD_BOOST) ENDIF () ELSE (THIRDPARTY_BUILD_BOOST) SET(Boost_DEBUG 1) - SET(Boost_USE_MULTITHREAD ON) - SET(Boost_ADDITIONAL_VERSIONS "1.49" "1.49.0" "1.48" "1.48.0" "1.47.0" "1.47" "1.46" "1.46. 1" "1.40" "1.40.0" "1.35.0" "1.35") + SET(Boost_USE_MULTITHREADED OFF) + SET(Boost_ADDITIONAL_VERSIONS "1.51" "1.51.0" "1.50" "1.50.0" "1.49" "1.49.0" "1.48" "1.48.0" "1.47.0" "1.47" "1.46" "1.46. 1" "1.40" "1.40.0" "1.35.0" "1.35") SET(Boost_NO_BOOST_CMAKE ON) IF( NOT BOOST_ROOT ) #If the user has not set BOOST_ROOT, look in a couple common places first. + SET(BOOST_ROOT $ENV{BOOST_HOME}) + FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex) SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/boost) FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex) SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/../ThirdParty/boost) -- GitLab