Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2013-12-23 19:52:34 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2013-12-23 19:53:15 +0400
commit7b97047b8ebefe877382a465a8f392cd82d4750f (patch)
tree9d1927556beb1d15ea0d258a764c0500072abc22 /CMakeLists.txt
parent890be761f58ee5f388ef52b19eab82d3dcd33718 (diff)
CMake: attempt to fix Boost detection on Fedora 20, which omits -mt.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86ba59297fa..0d53015e994 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)