[Bf-blender-cvs] [1df4f79] master: Attempt to fix compilation error with static boost on certain platforms

Sergey Sharybin noreply at git.blender.org
Mon Sep 5 13:10:45 CEST 2016


Commit: 1df4f792db24b6446ec84542d0936bda5cf179aa
Author: Sergey Sharybin
Date:   Mon Sep 5 13:10:19 2016 +0200
Branches: master
https://developer.blender.org/rB1df4f792db24b6446ec84542d0936bda5cf179aa

Attempt to fix compilation error with static boost on certain platforms

This was reported in T49231.

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

M	build_files/cmake/platform/platform_unix.cmake

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

diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index 0e0dc38..1ec9b00 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




More information about the Bf-blender-cvs mailing list