[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52960] trunk/blender/CMakeLists.txt: CMake: on linux, make boost now always require multithreaded libs, disabling
Brecht Van Lommel
brechtvanlommel at pandora.be
Thu Dec 13 09:46:07 CET 2012
Revision: 52960
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52960
Author: blendix
Date: 2012-12-13 08:46:07 +0000 (Thu, 13 Dec 2012)
Log Message:
-----------
CMake: on linux, make boost now always require multithreaded libs, disabling
this was a hack for the precompiled libs in svn. Also bumped minimum version
to 1.48 because that's the first version that contains boost::locale.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-12-13 08:45:55 UTC (rev 52959)
+++ trunk/blender/CMakeLists.txt 2012-12-13 08:46:07 UTC (rev 52960)
@@ -644,20 +644,15 @@
if(WITH_BOOST)
# uses in build instructions to override include and library variables
if(NOT BOOST_CUSTOM)
- # XXX No more lib dir, is this multithread stuff still needed?
if(${WITH_STATIC_LIBS})
set(Boost_USE_STATIC_LIBS ON)
endif()
- if(NOT BOOST_ROOT)
- set(Boost_USE_MULTITHREADED OFF)
- else()
- set(Boost_USE_MULTITHREADED ON)
- endif()
+ set(Boost_USE_MULTITHREADED ON)
set(__boost_packages filesystem regex system thread date_time)
if (WITH_INTERNATIONAL)
list(APPEND __boost_packages locale)
endif()
- find_package(Boost 1.34 COMPONENTS ${__boost_packages})
+ find_package(Boost 1.48 COMPONENTS ${__boost_packages})
if(Boost_USE_STATIC_LIBS AND Boost_USE_ICU)
find_package(IcuLinux)
endif()
More information about the Bf-blender-cvs
mailing list