[Bf-blender-cvs] [36f713e216f] master: CMake: Fix precompiled Boost libraries on Linux

Nathan Craddock noreply at git.blender.org
Sun Jan 26 07:39:15 CET 2020


Commit: 36f713e216f95c876d4d909c3f9da3baac6c2ddd
Author: Nathan Craddock
Date:   Wed Jan 22 22:38:26 2020 -0700
Branches: master
https://developer.blender.org/rB36f713e216f95c876d4d909c3f9da3baac6c2ddd

CMake: Fix precompiled Boost libraries on Linux

When building with precompiled libraries on Linux, CMake used boost libs
from the system outside the lib dir. This restricts CMake to use only the
libraries from the precompiled libraries.

Reviewed By: sergey

Differential Revision: https://developer.blender.org/D6659

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

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 5d46ee751af..e09287f05d9 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -53,6 +53,10 @@ if(EXISTS ${LIBDIR})
   set(CMAKE_PREFIX_PATH ${LIBDIR}/zlib ${LIB_SUBDIRS})
   set(WITH_STATIC_LIBS ON)
   set(WITH_OPENMP_STATIC ON)
+  set(Boost_NO_BOOST_CMAKE ON)
+  set(BOOST_ROOT ${LIBDIR}/boost)
+  set(BOOST_LIBRARYDIR ${LIBDIR}/boost/lib)
+  set(Boost_NO_SYSTEM_PATHS ON)
 endif()
 
 if(WITH_STATIC_LIBS)



More information about the Bf-blender-cvs mailing list