Skip to content

Commit e303a72

Browse files
authored
[usd] fix single config builds (microsoft#42446)
1 parent e534a9d commit e303a72

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

ports/usd/portfile.cmake

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,10 @@ if(VCPKG_TARGET_IS_WINDOWS)
118118
# Move all dlls to bin
119119
file(GLOB RELEASE_DLL ${CURRENT_PACKAGES_DIR}/lib/*.dll)
120120
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
121-
file(GLOB DEBUG_DLL ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)
122-
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
121+
if(NOT VCPKG_BUILD_TYPE)
122+
file(GLOB DEBUG_DLL ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)
123+
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
124+
endif()
123125
foreach(CURRENT_FROM ${RELEASE_DLL} ${DEBUG_DLL})
124126
string(REPLACE "/lib/" "/bin/" CURRENT_TO ${CURRENT_FROM})
125127
file(RENAME ${CURRENT_FROM} ${CURRENT_TO})
@@ -132,7 +134,9 @@ if(VCPKG_TARGET_IS_WINDOWS)
132134
endfunction()
133135

134136
# fix dll path for cmake
135-
file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-debug.cmake "debug/lib/([a-zA-Z0-9_]+)\\.dll" "debug/bin/\\1.dll")
137+
if(NOT VCPKG_BUILD_TYPE)
138+
file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-debug.cmake "debug/lib/([a-zA-Z0-9_]+)\\.dll" "debug/bin/\\1.dll")
139+
endif()
136140
file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-release.cmake "lib/([a-zA-Z0-9_]+)\\.dll" "bin/\\1.dll")
137141

138142
# fix plugInfo.json for runtime

ports/usd/vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "usd",
33
"version": "24.8",
4+
"port-version": 1,
45
"description": "Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.",
56
"homepage": "https://github.com/PixarAnimationStudios/USD",
67
"license": null,

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9262,7 +9262,7 @@
92629262
},
92639263
"usd": {
92649264
"baseline": "24.8",
9265-
"port-version": 0
9265+
"port-version": 1
92669266
},
92679267
"usearch": {
92689268
"baseline": "2.3.2",

versions/u-/usd.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "5d916134edd638a11c6a73e8553896d837d26f2b",
5+
"version": "24.8",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "ead0e855944ba468f8f3e4cc4f1875ae14e2bbc1",
510
"version": "24.8",

0 commit comments

Comments
 (0)