Commit: 1aa7dca0ba70cdb14f6da7309604f15e8f1ae56c
Author: Antonio Vazquez
Date: Tue Sep 15 15:26:59 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB1aa7dca0ba70cdb14f6da7309604f15e8f1ae56c
Merge branch 'master' into greasepencil-object
===================================================================
===================================================================
diff --cc build_files/build_environment/cmake/pugixml.cmake
index 932ccb65a23,4e0bd0eafcf..1f93723e936
--- a/build_files/build_environment/cmake/pugixml.cmake
+++ b/build_files/build_environment/cmake/pugixml.cmake
@@@ -36,8 -36,8 +36,8 @@@ if(WIN32
endif()
if(BUILD_MODE STREQUAL Debug)
ExternalProject_Add_Step(external_pugixml after_install
- COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib
${HARVEST_TARGET}/osl/lib/pugixml_d.lib
+ COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib
${HARVEST_TARGET}/pugixml/lib/pugixml_d.lib
DEPENDEES install
)
- endif()
- endif()
+ endif()
+ endif()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
