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:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-09-05 14:10:19 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-09-05 14:10:19 +0300
commit1df4f792db24b6446ec84542d0936bda5cf179aa (patch)
tree5bf3211e7410ecf4b6c3f91c5e63acde083cbb68
parent33fcd0444d45def9f86261fe4bc4d36986c1fc2f (diff)
Attempt to fix compilation error with static boost on certain platforms
This was reported in T49231.
-rw-r--r--build_files/cmake/platform/platform_unix.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index 0e0dc382ca3..1ec9b00d4ca 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -245,7 +245,7 @@ if(WITH_BOOST)
set(Boost_USE_STATIC_LIBS ON)
endif()
set(Boost_USE_MULTITHREADED ON)
- set(__boost_packages filesystem regex system thread date_time)
+ set(__boost_packages filesystem regex thread date_time)
if(WITH_CYCLES_OSL)
if(NOT (${OSL_LIBRARY_VERSION_MAJOR} EQUAL "1" AND ${OSL_LIBRARY_VERSION_MINOR} LESS "6"))
list(APPEND __boost_packages wave)
@@ -261,6 +261,7 @@ if(WITH_BOOST)
if(WITH_OPENVDB)
list(APPEND __boost_packages iostreams)
endif()
+ list(APPEND __boost_packages system)
find_package(Boost 1.48 COMPONENTS ${__boost_packages})
if(NOT Boost_FOUND)
# try to find non-multithreaded if -mt not found, this flag