diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-08-12 00:13:39 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-08-12 00:13:39 +0300 |
| commit | 9267d29bfbce36a60efdc0843ec5760cec8d8090 (patch) | |
| tree | ad4a30324adbbe07c36ed6c5426887a98bc08d32 /build_files/build_environment/cmake/zlib.cmake | |
| parent | a4c3a87635ab4079ae3ffa87a64488aae67d87b3 (diff) | |
build_environment: zlib move harvesting to zlib.cmake
Diffstat (limited to 'build_files/build_environment/cmake/zlib.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/zlib.cmake | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/build_files/build_environment/cmake/zlib.cmake b/build_files/build_environment/cmake/zlib.cmake index 3307cb1f167..4c422d501ee 100644 --- a/build_files/build_environment/cmake/zlib.cmake +++ b/build_files/build_environment/cmake/zlib.cmake @@ -25,9 +25,25 @@ ExternalProject_Add(external_zlib INSTALL_DIR ${LIBDIR}/zlib ) -if(BUILD_MODE STREQUAL Debug) - ExternalProject_Add_Step(external_zlib after_install - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${LIBDIR}/zlib/lib/${ZLIB_LIBRARY} +if (WIN32) + if(BUILD_MODE STREQUAL Release) + ExternalProject_Add_Step(external_zlib after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st${LIBEXT} + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/include/ ${HARVEST_TARGET}/zlib/include/ + DEPENDEES install + ) + endif() + if(BUILD_MODE STREQUAL Debug) + ExternalProject_Add_Step(external_zlib after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st_d${LIBEXT} DEPENDEES install - ) -endif() + ) + endif() +else() + if(BUILD_MODE STREQUAL Debug) + ExternalProject_Add_Step(external_zlib after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${LIBDIR}/zlib/lib/${ZLIB_LIBRARY} + DEPENDEES install + ) + endif() +endif()
\ No newline at end of file |