<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a32309278d6da0929736eadeecc0f28d44882a5f">https://github.com/macports/macports-ports/commit/a32309278d6da0929736eadeecc0f28d44882a5f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a32309278d6 usd: update to version 20.05
</span>a32309278d6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a32309278d6da0929736eadeecc0f28d44882a5f
</span>Author: Jason Liu <jasonliu--@users.noreply.github.com>
AuthorDate: Thu Feb 11 11:25:29 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> usd: update to version 20.05
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> New variants: +examples, +tutorials, +openvdb.
</span>---
graphics/usd/Portfile | 184 +++++++++++++++++----
graphics/usd/files/patch-add-blender-mods.diff | 47 ++++--
graphics/usd/files/patch-plugins-output-paths.diff | 14 +-
graphics/usd/files/patch-tests-output-paths.diff | 123 --------------
4 files changed, 197 insertions(+), 171 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/usd/Portfile b/graphics/usd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0319ddcf8fd..0c04b277d38 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/usd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/usd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup cmake 1.1
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup PixarAnimationStudios USD 20.02 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup PixarAnimationStudios USD 20.05 v
</span> name usd
categories graphics
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,17 +27,19 @@ long_description Universal Scene Description (USD) is a software \
</span> shading, models, and assets can be organized and \
manipulated.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 342d266a0be0774e22aa5653a9d22fa4e21f8e16 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a0eb6eacefbbfa88393021c63a51ca8c528c9607ad56968c177992b27bb45f7d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 30156908
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8ec6dda307f9804ce4b3a562c3df2dbd14a64390 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ad167b438401848fdd4133f4470a6288ccf37949b4ccc9abf52b50438380ec59 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24800580
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set py_ver 2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver 3.8
</span> set py_ver_nodot [string map {. {}} ${py_ver}]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver_major [lindex [split $py_ver .] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver_minor [lindex [split $py_ver .] 1]
</span>
depends_lib-append port:boost \
port:tbb
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2014
</span> # USD fails to compile for Clang older than 8.1.0
# (Note: Clang 8.1.0 == clang-802 in Xcode)
compiler.blacklist-append {clang < 802}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,8 +48,8 @@ compiler.blacklist-append {clang < 802}
</span> # file 'patch-add-blender-mods.diff' was extracted from the file in
# Blender's source code named
# 'build_files/build_environment/patches/usd.diff'. (No further
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# modifications to the patch itself were needed, since Blender 2.83 was
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# written to be compatible with USD version 19.11.) These modifications
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# modifications to the patch itself were needed, since Blender 2.90 was
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# written to be compatible with USD version 20.05.) These modifications
</span> # essentially add a hook for Blender to use, and shouldn't otherwise
# affect the functioning of USD.
patchfiles-append patch-add-blender-mods.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,6 +76,8 @@ post-patch {
</span> # Turn off all of USD's default build options. We will allow users to
# directly control these options using port variants.
configure.args -DPXR_BUILD_TESTS=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_BUILD_EXAMPLES=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_BUILD_TUTORIALS=OFF \
</span> -DPXR_BUILD_IMAGING=OFF \
-DPXR_BUILD_USD_IMAGING=OFF \
-DPXR_BUILD_USDVIEW=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,14 +86,56 @@ configure.args -DPXR_BUILD_TESTS=OFF \
</span> -DPXR_ENABLE_HDF5_SUPPORT=OFF \
-DPXR_ENABLE_PTEX_SUPPORT=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-test {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset tests]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "'tests' variant must be activated to enable test support"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Please enable the 'tests' variant and try again"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Certain Python script files are not getting their shebang lines
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# replaced by the 'cmake/macros/shebang.py' script during the build,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# so we do it for them.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc shebang dir {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix py_ver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists $dir] || ![file isdirectory $dir]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "$dir: No such directory"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse f $dir {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file isfile $f]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Look for the string we want to replace inside the contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # of the file before we actually do the substitution. This
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # prevents errors being thrown by reinplace in the case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # where the file in question is a binary file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fp [open $f r]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set count [regexp -all -- {pxrpythonsubst} [read $fp]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close $fp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$count > 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|/pxrpythonsubst|${prefix}/bin/python$py_ver|" $f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shebang ${destroot}${prefix}/share/usd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> ############################# Variants ##############################
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note: The various variant dependencies and package dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# specified in the variants below were obtained by looking at the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 'cmake/defaults/Packages.cmake' file in the USD source code.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_libs_dir ${frameworks_dir}/Python.framework/Versions/$py_ver/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant docs description {Build documentation} {
depends_build-append port:doxygen \
path:bin/dot:graphviz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|docs|share/doc/usd|g} ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|docs|share/doc/usd|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/cmake/macros/Public.cmake
</span> reinplace {/installPath = os/s|docs|share/doc/usd|} \
${worksrcpath}/cmake/macros/generateDocs.py
reinplace {/os.mkdir.installPath/s/mkdir/makedirs/} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,19 +145,64 @@ variant docs description {Build documentation} {
</span> reinplace "/PROJECT_NUMBER.*=/s/$/${version}/" \
${worksrcpath}/pxr/usd/usd/Doxyfile.in
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append -DPXR_BUILD_DOCUMENTATION=ON
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHANGELOG.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONTRIBUTING.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LICENSE.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NOTICE.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USD_CLA_Corporate.pdf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USD_CLA_Individual.pdf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/$f ${destroot}${prefix}/share/doc/usd/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant tests description {Build unit tests} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-tests-output-paths.diff
</span> configure.args-replace -DPXR_BUILD_TESTS=OFF \
-DPXR_BUILD_TESTS=ON
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shebang ${worksrcpath}/pxr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant examples description {Build examples} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DPXR_BUILD_EXAMPLES=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_BUILD_EXAMPLES=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # One of the examples' object file is getting compiled assuming
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # that its associated library is located in ${prefix}/lib,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # instead of inside the examples directory. I haven't been able
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to find where this is getting set in the source code, so we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix the path after it gets compiled.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set usdSchemaExamples_so \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $py_libs_dir/python${py_ver}/site-packages/pxr/UsdSchemaExamples/_usdSchemaExamples.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${destroot}$usdSchemaExamples_so]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system [join [list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "install_name_tool -change" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/usdSchemaExamples.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/share/usd/examples/share/usd/plugins/usdSchemaExamples.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}$usdSchemaExamples_so \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ] " "]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system [join [list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "install_name_tool -id" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $usdSchemaExamples_so \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}$usdSchemaExamples_so \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ] " "]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant tutorials requires python description {Build tutorials} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DPXR_BUILD_TUTORIALS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_BUILD_TUTORIALS=ON
</span> }
variant imaging description {Build imaging components} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:openexr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:opensubdiv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:opensubdiv
</span> configure.args-replace -DPXR_BUILD_IMAGING=OFF \
-DPXR_BUILD_IMAGING=ON
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,14 +210,12 @@ variant imaging description {Build imaging components} {
</span> variant usd_imaging requires imaging \
description {Build USD imaging components} \
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DPXR_USD_IMAGING=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPXR_USD_IMAGING=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DPXR_BUILD_USD_IMAGING=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_BUILD_USD_IMAGING=ON
</span> }
variant opengl description {Enable OpenGL-based components} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset imaging]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:glew
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:glew
</span> configure.args-replace -DPXR_ENABLE_GL_SUPPORT=OFF \
-DPXR_ENABLE_GL_SUPPORT=ON
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,25 +224,55 @@ variant python description {Enable Python-based components} {
</span> require_active_variants boost python${py_ver_nodot}
depends_lib-append port:python${py_ver_nodot} \
port:py${py_ver_nodot}-jinja2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # According to 'cmake --help-module FindBoost': "Note that Boost
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Python components require a Python version suffix (Boost 1.67
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and later), e.g. 'python36' or 'python27' for the versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # built against Python 3.6 and 2.7, respectively."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "/--Boost/,/--Jinja2/s/\(python\)/\\1${py_ver_nodot}/" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/cmake/defaults/Packages.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![active_variants boost cmake_scripts]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/set.boost_version_string/a\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\\ set(Boost_NO_BOOST_CMAKE TRUE)\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\\ if(NOT PYTHON_VERSION_MAJOR)\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\\ set(PYTHON_VERSION_MAJOR $py_ver_major)\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\\ endif()\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\\ if(NOT PYTHON_VERSION_MINOR)\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\\ set(PYTHON_VERSION_MINOR $py_ver_minor)\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\\ endif()\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/cmake/defaults/Packages.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/find_package(Boost/,/)/s|python$|python$py_ver_nodot|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/cmake/defaults/Packages.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pypath_regex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|\(lib/python\)|Library/Frameworks/Python.framework/Versions/$py_ver/\\1$py_ver/site-packages|"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/cmake/macros/Private.cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/pxr/usdImaging/usdviewq/CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E $pypath_regex $f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach search_regex [list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/_get_install_dir/" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/set._testPythonPath/" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E [join [list $search_regex $pypath_regex] ""] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/cmake/macros/Public.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> configure.args-replace -DPXR_ENABLE_PYTHON_SUPPORT=OFF \
-DPXR_ENABLE_PYTHON_SUPPORT=ON
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPXR_USE_PYTHON_3=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/bin/python$py_ver \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPythonLibs_DIR=$py_libs_dir
</span> }
variant viewer requires usd_imaging python opengl \
description {Build USD viewer} \
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${py_ver_nodot}-pyside \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${py_ver_nodot}-pyside-tools \
</span> port:py${py_ver_nodot}-opengl
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s/\(pyside-uic-\)2.7/\\1${py_ver}/" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/cmake/modules/FindPySide.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> configure.args-replace -DPXR_BUILD_USDVIEW=OFF \
-DPXR_BUILD_USDVIEW=ON
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,6 +283,11 @@ variant ptex description {Enable Ptex support} {
</span> -DPXR_ENABLE_PTEX_SUPPORT=ON
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant openvdb description {Enable OpenVDB support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:openvdb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPXR_ENABLE_OPENVDB_SUPPORT=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant monolithic \
description {Build the USD libraries as a single archive library, instead of modular individual libraries} \
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,7 +321,6 @@ variant hdf5 requires alembic \
</span>
variant materialx description {Build MaterialX plugin} {
depends_lib-append port:materialx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
foreach re [list \
"/find_package.MaterialX/i\\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -213,8 +336,7 @@ variant materialx description {Build MaterialX plugin} {
</span> reinplace -E {s|(stdlib_defs.mtlx)|share/MaterialX/libraries/stdlib/\1|} \
${worksrcpath}/cmake/modules/FindMaterialX.cmake
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append -DPXR_BUILD_MATERIALX_PLUGIN=ON
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +docs +tests +ptex +oiio +ocio +alembic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +docs +examples +tutorials +ptex
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/usd/files/patch-add-blender-mods.diff b/graphics/usd/files/patch-add-blender-mods.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cc97a4adde2..c31b1e11582 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/usd/files/patch-add-blender-mods.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/usd/files/patch-add-blender-mods.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pxr/base/plug/initConfig.cpp.orig 2020-01-24 14:25:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pxr/base/plug/initConfig.cpp 2021-01-24 12:38:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,8 +69,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pxr/base/plug/initConfig.cpp.orig 2020-04-13 14:32:52.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pxr/base/plug/initConfig.cpp 2021-02-02 09:30:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,10 +69,40 @@
</span>
ARCH_CONSTRUCTOR(Plug_InitConfig, 2, void)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,6 +27,8 @@
</span> +{
std::vector<std::string> result;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::vector<std::string> debugMessages;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> + // Add Blender-specific paths. They MUST end in a slash, or symlinks will not be treated as directory.
+ if (datafiles_usd_path != NULL && datafiles_usd_path[0] != '\0') {
+ std::string datafiles_usd_path_str(datafiles_usd_path);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,14 +38,14 @@
</span> + result.push_back(datafiles_usd_path_str);
+ }
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- // Determine the absolute path to the Plug shared library.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Any relative paths specified in the plugin search path will be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // anchored to this directory, to allow for relocatability.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -94,9 +124,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _AppendPathList(&result, installLocation, sharedLibPath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Determine the absolute path to the Plug shared library. Any relative
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // paths specified in the plugin search path will be anchored to this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // directory, to allow for relocatability. Note that this can fail when pxr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,9 +144,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _AppendPathList(&result, installLocation, binaryPath);
</span> #endif // PXR_INSTALL_LOCATION
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- Plug_SetPaths(result);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Plug_SetPaths(result, debugMessages);
</span> -}
+ if (!TfGetenv("PXR_PATH_DEBUG").empty()) {
+ printf("USD Plugin paths: (%zu in total):\n", result.size());
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +54,7 @@
</span> + }
+ }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Plug_SetPaths(result);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Plug_SetPaths(result, debugMessages);
</span> }
PXR_NAMESPACE_CLOSE_SCOPE
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,3 +68,28 @@
</span> + PXR_NS::usd_initialise_plugin_path(datafiles_usd_path);
+}
+}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pxr/base/arch/align.h.orig 2020-04-13 14:32:52.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pxr/base/arch/align.h 2021-02-02 09:36:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +77,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// The size of a CPU cache line on the current processor architecture in bytes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ///
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// \hideinitializer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(ARCH_OS_DARWIN) && defined(ARCH_CPU_ARM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define ARCH_CACHE_LINE_SIZE 128
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ARCH_CACHE_LINE_SIZE 64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ///@}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pxr/base/arch/math.h.orig 2020-04-13 14:32:52.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pxr/base/arch/math.h 2021-02-02 09:39:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// \addtogroup group_arch_Math
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ///@{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined (ARCH_CPU_INTEL) || defined(doxygen)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined (ARCH_CPU_INTEL) || defined(ARCH_CPU_ARM) || defined(doxygen)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// This is the smallest value e such that 1+e^2 == 1, using floats.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// True for all IEEE754 chipsets.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/usd/files/patch-plugins-output-paths.diff b/graphics/usd/files/patch-plugins-output-paths.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e11b15894f6..62754d04044 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/usd/files/patch-plugins-output-paths.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/usd/files/patch-plugins-output-paths.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/macros/Private.cmake.orig 2020-01-24 14:25:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/macros/Private.cmake 2021-01-24 12:32:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/macros/Private.cmake.orig 2020-04-13 14:32:52.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/macros/Private.cmake 2021-02-02 01:56:54.000000000 -0500
</span> @@ -97,7 +97,7 @@
_get_resources_dir_name(PLUG_INFO_RESOURCE_PATH)
set(PLUG_INFO_ROOT "..")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span>
configure_file(
${plugInfoPath}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1144,10 +1144,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1161,10 +1161,10 @@
</span> _get_install_dir("include/${PXR_PREFIX}/${NAME}" headerInstallPrefix)
_get_install_dir("lib" libInstallPrefix)
if(isPlugin)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@
</span> endif()
if(NOT isObject)
# A plugin embedded in the monolithic library is found in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1239,7 +1239,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1256,7 +1256,7 @@
</span> MFB_ALT_PACKAGE_NAME=${PXR_PACKAGE}
MFB_PACKAGE_MODULE=${pythonModuleName}
PXR_BUILD_LOCATION=usd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,9 @@
</span> ${pxrInstallLocation}
${pythonModulesEnabled}
${apiPrivate}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/macros/Public.cmake.orig 2020-01-24 14:25:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/macros/Public.cmake 2021-01-24 12:32:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -756,7 +756,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/macros/Public.cmake.orig 2020-04-13 14:32:52.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/macros/Public.cmake 2021-02-02 01:57:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -825,7 +825,7 @@
</span> "${plugInfoContents}")
install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/usd_plugInfo.json"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/usd/files/patch-tests-output-paths.diff b/graphics/usd/files/patch-tests-output-paths.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1f3408fbeec..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/usd/files/patch-tests-output-paths.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,123 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/macros/Public.cmake.orig 2020-01-24 14:25:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/macros/Public.cmake 2021-01-24 12:36:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -381,7 +381,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RENAME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __init__.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTINATION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tests/${tm_INSTALL_PREFIX}/lib/python/${MODULE_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ share/usd/tests/${tm_INSTALL_PREFIX}/lib/python/${MODULE_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${plugInfoFile}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -391,7 +391,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RENAME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- plugInfo.json
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTINATION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tests/${tm_INSTALL_PREFIX}/lib/python/${MODULE_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ share/usd/tests/${tm_INSTALL_PREFIX}/lib/python/${MODULE_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endfunction() # pxr_create_test_module
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -412,7 +412,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _pxr_target_link_libraries(${LIBRARY_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${bt_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _get_folder("tests/lib" folder)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _get_folder("share/usd/tests/lib" folder)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties(${LIBRARY_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOLDER "${folder}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -420,7 +420,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Find libraries under the install prefix, which has the core USD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libraries.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _pxr_init_rpath(rpath "tests/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _pxr_init_rpath(rpath "share/usd/tests/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _pxr_install_rpath(rpath ${LIBRARY_NAME})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -434,14 +434,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(TEST_PLUG_INFO_ROOT "..")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(LIBRARY_FILE "${CMAKE_SHARED_LIBRARY_PREFIX}${LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(testPlugInfoLibDir "tests/${bt_INSTALL_PREFIX}/lib/${LIBRARY_NAME}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(testPlugInfoLibDir "share/usd/tests/${bt_INSTALL_PREFIX}/lib/${LIBRARY_NAME}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(testPlugInfoResourceDir "${testPlugInfoLibDir}/${TEST_PLUG_INFO_RESOURCE_PATH}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(testPlugInfoPath "${CMAKE_BINARY_DIR}/${testPlugInfoResourceDir}/plugInfo.json")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(RELATIVE_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PLUG_INFO_LIBRARY_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_INSTALL_PREFIX}/${testPlugInfoLibDir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${CMAKE_INSTALL_PREFIX}/tests/lib/${LIBRARY_FILE}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "${CMAKE_INSTALL_PREFIX}/share/usd/tests/lib/${LIBRARY_FILE}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure_file("${testPlugInfoSrcPath}" "${testPlugInfoPath}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # XXX -- We shouldn't have to install to run tests.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -464,9 +464,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # XXX -- We shouldn't have to install to run tests.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TARGETS ${LIBRARY_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBRARY DESTINATION "tests/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ARCHIVE DESTINATION "tests/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- RUNTIME DESTINATION "tests/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBRARY DESTINATION "share/usd/tests/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ARCHIVE DESTINATION "share/usd/tests/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ RUNTIME DESTINATION "share/usd/tests/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endfunction() # pxr_build_test_shared_lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -485,7 +485,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Turn PIC ON otherwise ArchGetAddressInfo() on Linux may yield
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # unexpected results.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _get_folder("tests/bin" folder)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _get_folder("share/usd/tests/bin" folder)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties(${TEST_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOLDER "${folder}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -500,13 +500,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Find libraries under the install prefix, which has the core USD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libraries.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _pxr_init_rpath(rpath "tests")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _pxr_init_rpath(rpath "share/usd/tests")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _pxr_install_rpath(rpath ${TEST_NAME})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # XXX -- We shouldn't have to install to run tests.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(TARGETS ${TEST_NAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- RUNTIME DESTINATION "tests"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ RUNTIME DESTINATION "share/usd/tests"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endfunction() # pxr_build_test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -526,7 +526,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # XXX -- We shouldn't have to install to run tests.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PROGRAMS ${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DESTINATION tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DESTINATION share/usd/tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RENAME ${destFile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endforeach()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -544,7 +544,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # XXX -- We shouldn't have to install to run tests.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIRECTORY ${bt_SRC}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DESTINATION tests/ctest/${bt_DEST}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DESTINATION share/usd/tests/ctest/${bt_DEST}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endfunction() # pxr_install_test_dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -615,9 +615,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # assume the testenv has the same name as the test but allow it to be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # overridden by specifying TESTENV.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (bt_TESTENV)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(testenvDir ${CMAKE_INSTALL_PREFIX}/tests/ctest/${bt_TESTENV})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(testenvDir ${CMAKE_INSTALL_PREFIX}/share/usd/tests/ctest/${bt_TESTENV})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(testenvDir ${CMAKE_INSTALL_PREFIX}/tests/ctest/${TEST_NAME})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(testenvDir ${CMAKE_INSTALL_PREFIX}/share/usd/tests/ctest/${TEST_NAME})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(testWrapperCmd ${testWrapperCmd} --testenv-dir=${testenvDir})
</span></pre><pre style='margin:0'>
</pre>