[Bf-blender-cvs] [8c361d6f66c] master: deps_builder: fix missing png harvest on windows
Ray Molenkamp
noreply at git.blender.org
Thu Oct 20 19:46:49 CEST 2022
Commit: 8c361d6f66cf4d87f5fd220ff056ea563a7d8e07
Author: Ray Molenkamp
Date: Thu Oct 20 11:46:42 2022 -0600
Branches: master
https://developer.blender.org/rB8c361d6f66cf4d87f5fd220ff056ea563a7d8e07
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