[usd] does not work on arm64 (#27100)

This commit is contained in:
autoantwort 2022-10-05 23:59:14 +02:00 committed by GitHub
parent d98da60f99
commit 725395a0eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 7 deletions

View File

@ -29,9 +29,8 @@ ELSE()
file(REMOVE ${SOURCE_PATH}/cmake/modules/FindTBB.cmake)
ENDIF()
vcpkg_configure_cmake(
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DPXR_BUILD_ALEMBIC_PLUGIN:BOOL=OFF
-DPXR_BUILD_EMBREE_PLUGIN:BOOL=OFF
@ -46,14 +45,14 @@ vcpkg_configure_cmake(
-DPXR_BUILD_USD_TOOLS:BOOL=OFF
)
vcpkg_install_cmake()
vcpkg_cmake_install()
file(
RENAME
"${CURRENT_PACKAGES_DIR}/pxrConfig.cmake"
"${CURRENT_PACKAGES_DIR}/cmake/pxrConfig.cmake")
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/pxr)
vcpkg_cmake_config_fixup(CONFIG_PATH cmake PACKAGE_NAME pxr)
vcpkg_copy_pdbs()

View File

@ -1,10 +1,11 @@
{
"name": "usd",
"version-string": "20.08",
"port-version": 3,
"port-version": 4,
"description": "Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.",
"homepage": "https://github.com/PixarAnimationStudios/USD",
"supports": "!x86",
"license": null,
"supports": "!x86 & !arm",
"dependencies": [
"boost-assign",
"boost-crc",
@ -17,6 +18,14 @@
"boost-system",
"boost-vmd",
"tbb",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
},
"zlib"
]
}

View File

@ -7550,7 +7550,7 @@
},
"usd": {
"baseline": "20.08",
"port-version": 3
"port-version": 4
},
"usockets": {
"baseline": "0.8.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b4c2d8c578eff85a0c1c897c595ddc35240cce98",
"version-string": "20.08",
"port-version": 4
},
{
"git-tree": "c241a36daa1c8695be5e0d4a8a29f2cc304dd6b1",
"version-string": "20.08",