Revision: 41762
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41762
Author: blendix
Date: 2011-11-11 20:57:00 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------
Cycles: more linux build system tweaks, attempting to avoid using boost
system libraries by default if we have a lib/ directory.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/scons/config/linux-config.py
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-11-11 20:35:03 UTC (rev 41761)
+++ trunk/blender/CMakeLists.txt 2011-11-11 20:57:00 UTC (rev 41762)
@@ -524,14 +524,15 @@
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()
Modified: trunk/blender/build_files/scons/config/linux-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linux-config.py 2011-11-11
20:35:03 UTC (rev 41761)
+++ trunk/blender/build_files/scons/config/linux-config.py 2011-11-11
20:57:00 UTC (rev 41762)
@@ -211,7 +211,7 @@
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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
