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:
authorRay Molenkamp <github@lazydodo.com>2018-08-12 00:13:39 +0300
committerRay Molenkamp <github@lazydodo.com>2018-08-12 00:13:39 +0300
commit9267d29bfbce36a60efdc0843ec5760cec8d8090 (patch)
treead4a30324adbbe07c36ed6c5426887a98bc08d32 /build_files/build_environment/cmake/harvest.cmake
parenta4c3a87635ab4079ae3ffa87a64488aae67d87b3 (diff)
build_environment: zlib move harvesting to zlib.cmake
Diffstat (limited to 'build_files/build_environment/cmake/harvest.cmake')
-rw-r--r--build_files/build_environment/cmake/harvest.cmake6
1 files changed, 1 insertions, 5 deletions
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake
index 5adfb951215..860800f05b8 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -28,11 +28,7 @@ message("HARVEST_TARGET = ${HARVEST_TARGET}")
if(WIN32)
if(BUILD_MODE STREQUAL Release)
add_custom_target(Harvest_Release_Results
- # Zlib Rename the lib file and copy the include/bin folders
- COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic.lib ${HARVEST_TARGET}/zlib/lib/libz_st.lib &&
- ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/include/ ${HARVEST_TARGET}/zlib/include/ &&
- ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/bin/ ${HARVEST_TARGET}/zlib/bin/ &&
- # jpeg rename libfile + copy include
+ COMMAND # jpeg rename libfile + copy include
${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
# pthreads, rename include dir