diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-11 09:03:31 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-11 09:03:31 +0300 |
| commit | 45af6b61d9e2760409d642ddc19b51e6aa42481d (patch) | |
| tree | ccb7162a85a8e451203c212ddf52b5458bc79a06 /build_files/build_environment/cmake/zlib.cmake | |
| parent | 0117a4c351e59711eaea314db3315db0a57c01ee (diff) | |
| parent | 0276e0e7de4a2164c95d5b167d245d2515991dc4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/build_environment/cmake/zlib.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/zlib.cmake | 2 |
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 |