Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2022-11-03 18:41:58 +0300
committerRay Molenkamp <github@lazydodo.com>2022-11-03 18:41:58 +0300
commit33f8c515d163fb74b6e983faced884ecf0d34ca3 (patch)
tree1c182eccd82d807d1e29aae55d8bbde11b36f47e /build_files/build_environment/cmake/usd.cmake
parent48214e2357192905d910d07309ab8c653bc4cf02 (diff)
deps: USD 21.11
also small patch to OpenVDB due to USD (C++14) and OpenVDB(C++17) running into trouble together.
Diffstat (limited to 'build_files/build_environment/cmake/usd.cmake')
-rw-r--r--build_files/build_environment/cmake/usd.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/build_files/build_environment/cmake/usd.cmake b/build_files/build_environment/cmake/usd.cmake
index 8601bd91f25..4abb368e740 100644
--- a/build_files/build_environment/cmake/usd.cmake
+++ b/build_files/build_environment/cmake/usd.cmake
@@ -122,8 +122,8 @@ if(WIN32)
if(BUILD_MODE STREQUAL Debug)
ExternalProject_Add_Step(external_usd after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/lib/python ${HARVEST_TARGET}/usd/lib/debug/python
- COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/usd/lib/usd_usd_ms_d.dll ${HARVEST_TARGET}/usd/lib/usd_usd_ms_d.dll
- COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/usd/lib/usd_usd_ms_d.lib ${HARVEST_TARGET}/usd/lib/usd_usd_ms_d.lib
+ COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/usd/lib/usd_ms_d.dll ${HARVEST_TARGET}/usd/lib/usd_ms_d.dll
+ COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/usd/lib/usd_ms_d.lib ${HARVEST_TARGET}/usd/lib/usd_ms_d.lib
DEPENDEES install
)
endif()