[Bf-blender-cvs] [f6294c437fb] blender-v3.3-release: deps_builder: fix missing png harvest on windows

Ray Molenkamp noreply at git.blender.org
Thu Nov 3 15:04:28 CET 2022


Commit: f6294c437fb708a70d2d14d5423c3630814cc058
Author: Ray Molenkamp
Date:   Thu Oct 20 11:46:42 2022 -0600
Branches: blender-v3.3-release
https://developer.blender.org/rBf6294c437fb708a70d2d14d5423c3630814cc058

deps_builder: fix missing png harvest on windows

===================================================================

M	build_files/build_environment/cmake/png.cmake

===================================================================

diff --git a/build_files/build_environment/cmake/png.cmake b/build_files/build_environment/cmake/png.cmake
index 890be673cb8..371f2608e2a 100644
--- a/build_files/build_environment/cmake/png.cmake
+++ b/build_files/build_environment/cmake/png.cmake
@@ -24,6 +24,14 @@ add_dependencies(
   external_zlib
 )
 
+if(WIN32 AND BUILD_MODE STREQUAL Release)
+  ExternalProject_Add_Step(external_png after_install
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static${LIBEXT} ${HARVEST_TARGET}/png/lib/libpng${LIBEXT}
+    DEPENDEES install
+  )
+endif()
+
 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}



More information about the Bf-blender-cvs mailing list