Commit: a7716a4dde8fcc484701edc7f0ea8ec2d204cf0d
Author: Ray Molenkamp
Date: Sun Nov 10 15:45:30 2019 -0700
Branches: temp-lanpr-cleanup2
https://developer.blender.org/rBa7716a4dde8fcc484701edc7f0ea8ec2d204cf0d
Windows: Fix build errors during deps build on windows.
===================================================================
M build_files/build_environment/cmake/harvest.cmake
M build_files/build_environment/cmake/opencolorio.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/harvest.cmake
b/build_files/build_environment/cmake/harvest.cmake
index 38820dfb673..89eec7cf72f 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -52,7 +52,7 @@ if(BUILD_MODE STREQUAL Release)
${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib
${HARVEST_TARGET}/tiff/lib/libtiff.lib &&
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/
${HARVEST_TARGET}/tiff/include/ &&
# hidapi
- ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hidapi/
${HARVEST_TARGET}/hidapi/ &&
+ ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hidapi/
${HARVEST_TARGET}/hidapi/
DEPENDS
)
endif()
diff --git a/build_files/build_environment/cmake/opencolorio.cmake
b/build_files/build_environment/cmake/opencolorio.cmake
index d75b4325847..502e9a6c03b 100644
--- a/build_files/build_environment/cmake/opencolorio.cmake
+++ b/build_files/build_environment/cmake/opencolorio.cmake
@@ -95,7 +95,7 @@ if(WIN32)
ExternalProject_Add_Step(external_opencolorio after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/include
${HARVEST_TARGET}/opencolorio/include
COMMAND ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/opencolorio/lib/static ${HARVEST_TARGET}/opencolorio/lib
- COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmt.lib
${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp.lib
+ COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmd.lib
${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp.lib
COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tinyxml/lib/tinyxml.lib
${HARVEST_TARGET}/opencolorio/lib/tinyxml.lib
DEPENDEES install
)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
