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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-10 15:25:06 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-11 08:51:17 +0300
commitcd5db907261e92a27c1b43117e3976dc055246ae (patch)
tree61c755b6eb23701e98aef111155ed93c40119d4c /build_files/build_environment/cmake/zlib.cmake
parent6bf003bce065a7e8c36642cc3dc66f722462673f (diff)
Build Environment: updates for macOS.
Mainly this is following Linux to build own xml2/lzma/ssl/sqlite and linking them all statically. This ensures the Python ssl module uses a recent openssl version rather than a very old one shipped with macOS.
Diffstat (limited to 'build_files/build_environment/cmake/zlib.cmake')
-rw-r--r--build_files/build_environment/cmake/zlib.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/zlib.cmake b/build_files/build_environment/cmake/zlib.cmake
index 7bf1c45e359..396bb3a318e 100644
--- a/build_files/build_environment/cmake/zlib.cmake
+++ b/build_files/build_environment/cmake/zlib.cmake
@@ -46,7 +46,7 @@ else()
DEPENDEES install
)
endif()
- if (UNIX AND NOT APPLE)
+ if (UNIX)
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