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:
authorNathan Craddock <nzcraddock@gmail.com>2020-01-23 08:38:26 +0300
committerNathan Craddock <nzcraddock@gmail.com>2020-01-26 09:37:13 +0300
commit36f713e216f95c876d4d909c3f9da3baac6c2ddd (patch)
treee5797de7f751e74a002124859b092a4646e4bfc5 /build_files
parent5325bc3fb62967cd43ecbe842b632717be5aa905 (diff)
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
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/platform/platform_unix.cmake4
1 files changed, 4 insertions, 0 deletions
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)