diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 16:27:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 16:27:10 +0300 |
| commit | 5f22de843953131d4c114644867b8e6fde508ca2 (patch) | |
| tree | 87327784141392fb3372ff0fda981106361f953e /build_files/build_environment | |
| parent | 88a80fcec8672b5bb67041456dc7f7101aae3d55 (diff) | |
| parent | 165caafb99c6846e53d11c4e966990aaffc06cea (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'build_files/build_environment')
| -rw-r--r-- | build_files/build_environment/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/png.cmake | 2 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/tiff.cmake | 2 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/zlib.cmake | 16 |
4 files changed, 7 insertions, 15 deletions
diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt index 8c1d38c0635..f76c8175e50 100644 --- a/build_files/build_environment/CMakeLists.txt +++ b/build_files/build_environment/CMakeLists.txt @@ -114,7 +114,7 @@ endif() if(NOT WIN32 OR ENABLE_MINGW64) include(cmake/openjpeg.cmake) - if(BUILD_MODE STREQUAL Release) + if(NOT WIN32 OR BUILD_MODE STREQUAL Release) if(WIN32) include(cmake/zlib_mingw.cmake) endif() diff --git a/build_files/build_environment/cmake/png.cmake b/build_files/build_environment/cmake/png.cmake index 803438cbd2a..6e51fb9ebe4 100644 --- a/build_files/build_environment/cmake/png.cmake +++ b/build_files/build_environment/cmake/png.cmake @@ -36,7 +36,7 @@ add_dependencies( external_zlib ) -if(BUILD_MODE STREQUAL Debug) +if(WIN32 AND BUILD_MODE STREQUAL Debug) ExternalProject_Add_Step(external_png after_install COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_staticd${LIBEXT} ${LIBDIR}/png/lib/libpng16${LIBEXT} DEPENDEES install diff --git a/build_files/build_environment/cmake/tiff.cmake b/build_files/build_environment/cmake/tiff.cmake index 0f22daf05b1..498145463cf 100644 --- a/build_files/build_environment/cmake/tiff.cmake +++ b/build_files/build_environment/cmake/tiff.cmake @@ -39,7 +39,7 @@ add_dependencies( external_zlib ) -if(BUILD_MODE STREQUAL Debug) +if(WIN32 AND BUILD_MODE STREQUAL Debug) ExternalProject_Add_Step(external_tiff after_install COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiffd${LIBEXT} ${LIBDIR}/tiff/lib/tiff${LIBEXT} DEPENDEES install diff --git a/build_files/build_environment/cmake/zlib.cmake b/build_files/build_environment/cmake/zlib.cmake index 396bb3a318e..3c07fb3c08a 100644 --- a/build_files/build_environment/cmake/zlib.cmake +++ b/build_files/build_environment/cmake/zlib.cmake @@ -40,16 +40,8 @@ if (WIN32) ) 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() - 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 - ) - endif() + 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() |