[Bf-blender-cvs] [7b97047] master: CMake: attempt to fix Boost detection on Fedora 20, which omits -mt.

Brecht Van Lommel noreply at git.blender.org
Mon Dec 23 16:53:44 CET 2013


Commit: 7b97047b8ebefe877382a465a8f392cd82d4750f
Author: Brecht Van Lommel
Date:   Mon Dec 23 16:52:34 2013 +0100
http://developer.blender.org/rB7b97047b8ebefe877382a465a8f392cd82d4750f

CMake: attempt to fix Boost detection on Fedora 20, which omits -mt.

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86ba592..0d53015 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -741,6 +741,13 @@ if(UNIX AND NOT APPLE)
 				list(APPEND __boost_packages serialization)
 			endif()
 			find_package(Boost 1.48 COMPONENTS ${__boost_packages})
+			if(NOT Boost_FOUND)
+				# try to find non-multithreaded if -mt not found, this flag
+				# doesn't matter for us, it has nothing to do with thread
+				# safety, but keep it to not disturb build setups
+				set(Boost_USE_MULTITHREADED OFF)
+				find_package(Boost 1.48 COMPONENTS ${__boost_packages})
+			endif()
 			unset(__boost_packages)
 			if(Boost_USE_STATIC_LIBS AND WITH_BOOST_ICU)
 				find_package(IcuLinux)




More information about the Bf-blender-cvs mailing list