From 0f85990d4adf648dcb79b2196116191583011de3 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 11 Nov 2011 20:57:00 +0000 Subject: Cycles: more linux build system tweaks, attempting to avoid using boost system libraries by default if we have a lib/ directory. --- CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 14ac05bf6c1..36ef022f3c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -524,14 +524,15 @@ if(UNIX AND NOT APPLE) endif() if(WITH_BOOST) - # use lib dir if available and nothing else specified - if(LIBDIR AND NOT BOOST_ROOT) - set(BOOST_ROOT ${LIBDIR}/boost) - endif() - # uses in build instructions to override include and library variables if(NOT BOOST_CUSTOM) - set(Boost_USE_MULTITHREADED ON) + # use lib dir if available and nothing else specified + if(LIBDIR AND NOT BOOST_ROOT) + set(BOOST_ROOT ${LIBDIR}/boost) + set(Boost_USE_MULTITHREADED OFF) + else() + set(Boost_USE_MULTITHREADED ON) + endif() find_package(Boost 1.34 COMPONENTS filesystem regex system thread) mark_as_advanced(Boost_DIR) # why doesnt boost do this? endif() -- cgit v1.2.3