[Bf-blender-cvs] [29b87b5615f] master: Fix T75357: USD export broken on windows

Ray Molenkamp noreply at git.blender.org
Mon Apr 6 22:38:58 CEST 2020


Commit: 29b87b5615f60919977f2e383e8fdf30bdf498fb
Author: Ray Molenkamp
Date:   Mon Apr 6 14:38:52 2020 -0600
Branches: master
https://developer.blender.org/rB29b87b5615f60919977f2e383e8fdf30bdf498fb

Fix T75357: USD export broken on windows

Path to the jsons was wrong so they were not copied

===================================================================

M	build_files/cmake/platform/platform_win32.cmake

===================================================================

diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 452deb497b2..1ecde8635c8 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -669,7 +669,7 @@ if(WITH_USD)
     set(USD_INCLUDE_DIRS ${LIBDIR}/usd/include)
     set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/libusd_m.lib)
     set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/libusd_m_d.lib)
-    set(USD_LIBRARY_DIR ${LIBDIR}/usd/lib/usd)
+    set(USD_LIBRARY_DIR ${LIBDIR}/usd/lib)
     set(USD_LIBRARIES
       debug ${USD_DEBUG_LIB}
       optimized ${USD_RELEASE_LIB}



More information about the Bf-blender-cvs mailing list