Cycles: more linux build system tweaks, attempting to avoid using boost
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 11 Nov 2011 20:57:00 +0000 (20:57 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 11 Nov 2011 20:57:00 +0000 (20:57 +0000)
system libraries by default if we have a lib/ directory.

CMakeLists.txt
build_files/scons/config/linux-config.py

index 14ac05bf6c16dbebf3ae754539694cebb7379e0e..36ef022f3c10291f19fe091d00563cd0ae744a45 100644 (file)
@@ -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()
index 7644259d3908939cc5a71c21e638d8999d566910..655054706f550df88aa7e058da95c9e9e168c2f1 100644 (file)
@@ -211,7 +211,7 @@ if not os.path.exists(LCGDIR + '/boost'):
     WITH_BF_BOOST = False
     BF_BOOST = '/usr'
 BF_BOOST_INC = BF_BOOST + '/include'
-BF_BOOST_LIB = 'boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt'
+BF_BOOST_LIB = 'boost_date_time boost_filesystem boost_regex boost_system boost_thread'
 BF_BOOST_LIBPATH = BF_BOOST + '/lib'
 
 WITH_BF_CYCLES = WITH_BF_OIIO and WITH_BF_BOOST