diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2022-10-29 19:02:33 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2022-10-29 19:02:33 +0300 |
| commit | ce3a045009f298ad5014f36ace07b104f696b924 (patch) | |
| tree | c0a9d8bdbb7bf8fc7ea3bd61ab1d6cf2ab3a79a3 | |
| parent | 0355f1c09b5de37894652aba950a25d4c74ad147 (diff) | |
CMake: Copy USD 21.11 datafiles to the right location.
We used the presence of USD dll as an indicator we were
using dynamic libs where the datafiles sit next to the
DLL. 22.11 changed the dll name, so it wrongly assumed
we were using static libs and copied the USD datafiles
into the blender datafiles folder instead.
| -rw-r--r-- | source/creator/CMakeLists.txt | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 4696497fa90..aaa11e1b2ed 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -952,8 +952,8 @@ elseif(WIN32) DEBUG ) - # This will not exist for 3.3 and earlier lib folders - # to ease the transition, support both 3.3 and 3.4 lib + # This will not exist for 3.4 and earlier lib folders + # to ease the transition, support both 3.4 and 3.5 lib # folders. if(EXISTS ${LIBDIR}/openvdb/python/pyopenvdb_d.pyd) install( @@ -1050,8 +1050,8 @@ elseif(WIN32) ) if(WITH_USD) - # This will not exist for 3.3 and earlier lib folders - # to ease the transition, support both 3.3 and 3.4 lib + # This will not exist for 3.4 and earlier lib folders + # to ease the transition, support both 3.4 and 3.5 lib # folders. if(EXISTS ${USD_LIBRARY_DIR}/python/) install( @@ -1439,8 +1439,13 @@ if(WITH_USD) # On windows the usd library sits in ./blender.shared copy the files # relative to the location of the USD dll, if the dll does not exist - # assume we are linking against the static 3.4 lib. - if(WIN32 AND EXISTS ${LIBDIR}/usd/lib/usd_usd_ms.dll) + # assume we are linking against the static 3.5 lib. + if(WIN32 AND + ( + EXISTS ${LIBDIR}/usd/lib/usd_usd_ms.dll OR # USD 22.03 + EXISTS ${LIBDIR}/usd/lib/usd_ms.dll # USD 22.11 + ) + ) install(DIRECTORY ${USD_LIBRARY_DIR}/usd DESTINATION "./blender.shared" |