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>2018-08-28 19:28:05 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-08-28 19:29:13 +0300
commitc70eb30240f8b5d5a8f2ac509f0eb585936142b5 (patch)
tree99220555b77c180216f95cf5da68a87136eae050 /build_files/build_environment/cmake/zlib.cmake
parent19c65cd6e2a61a4eec4aa8ea11128a4675aa34b1 (diff)
Build environment: Make sure Python is linkign against static Zlib
There is system-wide libz development package installed by default, needed for some other dependencies. This patch ensures Python will use our own self-compiled Zlib.
Diffstat (limited to 'build_files/build_environment/cmake/zlib.cmake')
-rw-r--r--build_files/build_environment/cmake/zlib.cmake6
1 files changed, 6 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/zlib.cmake b/build_files/build_environment/cmake/zlib.cmake
index b768293487a..7bf1c45e359 100644
--- a/build_files/build_environment/cmake/zlib.cmake
+++ b/build_files/build_environment/cmake/zlib.cmake
@@ -46,4 +46,10 @@ else()
DEPENDEES install
)
endif()
+ if (UNIX AND NOT APPLE)
+ ExternalProject_Add_Step(external_zlib after_install
+ COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/libz.a ${LIBDIR}/zlib/lib/libz_pic.a
+ DEPENDEES install
+ )
+ endif()
endif()