Commit: 58f8eb54a3641742f85e2304b3caa717bae56c18
Author: Ray Molenkamp
Date: Fri Jan 21 11:36:56 2022 -0700
Branches: master
https://developer.blender.org/rB58f8eb54a3641742f85e2304b3caa717bae56c18
deps/win: fix typo in brotli.cmake
it was harvesting to the zstd folder which
is not where these libs ought to be.
===================================================================
M build_files/build_environment/cmake/brotli.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/brotli.cmake
b/build_files/build_environment/cmake/brotli.cmake
index 24fdeae15af..3264fa2516f 100644
--- a/build_files/build_environment/cmake/brotli.cmake
+++ b/build_files/build_environment/cmake/brotli.cmake
@@ -31,8 +31,8 @@ ExternalProject_Add(external_brotli
if(BUILD_MODE STREQUAL Release AND WIN32)
ExternalProject_Add_Step(external_brotli after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/brotli/include
${HARVEST_TARGET}/brotli/include
- COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/brotli/lib/brotlidec-static${LIBEXT}
${HARVEST_TARGET}/zstd/lib/brotlidec-static${LIBEXT}
- COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/brotli/lib/brotlicommon-static${LIBEXT}
${HARVEST_TARGET}/zstd/lib/brotlicommon-static${LIBEXT}
+ COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/brotli/lib/brotlidec-static${LIBEXT}
${HARVEST_TARGET}/brotli/lib/brotlidec-static${LIBEXT}
+ COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/brotli/lib/brotlicommon-static${LIBEXT}
${HARVEST_TARGET}/brotli/lib/brotlicommon-static${LIBEXT}
DEPENDEES install
)
endif()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
