<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/370dafef40932d2a53303c40d4c09ae3f6f28c8b">https://github.com/macports/macports-ports/commit/370dafef40932d2a53303c40d4c09ae3f6f28c8b</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 370dafef409 usd: new port
</span>370dafef409 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 370dafef40932d2a53303c40d4c09ae3f6f28c8b
</span>Author: Jason Liu <jasonliu--@users.noreply.github.com>
AuthorDate: Sat Oct 10 13:04:45 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> usd: new port
</span>---
graphics/usd/Portfile | 221 +++++++++++++++++++++
graphics/usd/files/patch-add-blender-mods.diff | 68 +++++++
graphics/usd/files/patch-plugins-output-paths.diff | 44 ++++
graphics/usd/files/patch-tests-output-paths.diff | 123 ++++++++++++
4 files changed, 456 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/usd/Portfile b/graphics/usd/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..663f44916b1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/usd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,221 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup PixarAnimationStudios USD 19.11 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name usd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories graphics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license Apache-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers @jasonliu--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://www.openusd.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description universal scene description
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Universal Scene Description (USD) is a software \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ library, developed by Pixar Animation Studios, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ that provides a system for authoring, reading, and \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ streaming time-sampled scene description for \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ interchange between computer graphics \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ applications. It organizes data into hierarchical \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespaces of primitives and their properties. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This provides a set of schemas upon which common \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3-D computer graphics concepts such as geometry, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shading, models, and assets can be organized and \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ manipulated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 26c4c38b45e9254395b5e673a15ed95fb9465a44 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 84f3bb123f7950b277aace096d678c8876737add0ed0b6ccb77cabb4f32dbcb0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 37563211
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver 2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver_nodot [string map {. {}} ${py_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:boost \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# USD fails to compile for Clang older than 8.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (Note: Clang 8.1.0 == clang-802 in Xcode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 802}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This patch adds modifications that allow Blender to use USD. The patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# file 'patch-add-blender-mods.diff' was extracted from the file in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Blender's source code named
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 'build_files/build_environment/patches/usd.diff'. (No further
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# modifications to the patch itself were needed, since Blender 2.83 was
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# written to be compatible with USD version 19.11.) These modifications
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# essentially add a hook for Blender to use, and shouldn't otherwise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# affect the functioning of USD.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-add-blender-mods.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# By default, USD places plugins in a ${prefix}/plugin directory. This
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch changes it so that the plugins get placed in a location that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# conforms with MacPorts' mtree layout: ${prefix}/share/usd/plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-plugins-output-paths.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # USD puts its CMake package config files in the wrong place
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|cmake/||} ${worksrcpath}/pxr/pxrConfig.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|\(set.PXR_INCLUDE_DIRS \).*|\\1\"${prefix}/include\")|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/pxr/pxrConfig.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach re [list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {s|(PROJECT_BINARY_DIR.*)(pxrConfig)|\1lib/cmake/usd/\2|} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {/DESTINATION.*CMAKE_INSTALL_PREFIX/s|(DESTINATION ")(.*)"|\1\2/lib/cmake/usd"|} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {/DESTINATION.*cmake/s|(DESTINATION ")cmake|\1lib/cmake/usd|} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E $re ${worksrcpath}/pxr/CMakeLists.txt
</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;'>+# Turn off all of USD's default build options. We will allow users to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# directly control these options using port variants.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -DPXR_BUILD_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_BUILD_IMAGING=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_BUILD_USD_IMAGING=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_BUILD_USDVIEW=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_ENABLE_GL_SUPPORT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_ENABLE_PYTHON_SUPPORT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_ENABLE_HDF5_SUPPORT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_ENABLE_PTEX_SUPPORT=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+############################# Variants ##############################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant docs description {Build documentation} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/dot:graphviz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|docs|share/doc/usd|g} ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {/installPath = os/s|docs|share/doc/usd|} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/cmake/macros/generateDocs.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {/os.mkdir.installPath/s/mkdir/makedirs/} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/cmake/macros/generateDocs.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {/PROJECT_NAME.*=/s/$/"Universal Scene Description"/} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/pxr/usd/lib/usd/Doxyfile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/PROJECT_NUMBER.*=/s/$/${version}/" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/pxr/usd/lib/usd/Doxyfile.in
</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;'>+ configure.args-append -DPXR_BUILD_DOCUMENTATION=ON
</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 tests description {Build unit tests} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-tests-output-paths.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DPXR_BUILD_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_BUILD_TESTS=ON
</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 imaging description {Build imaging components} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:openexr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:opensubdiv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DPXR_BUILD_IMAGING=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_BUILD_IMAGING=ON
</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 usd_imaging requires imaging \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Build USD imaging components} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DPXR_USD_IMAGING=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_USD_IMAGING=ON
</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 opengl description {Enable OpenGL-based components} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset imaging]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:glew
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DPXR_ENABLE_GL_SUPPORT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_ENABLE_GL_SUPPORT=ON
</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 python description {Enable Python-based components} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants boost python${py_ver_nodot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python${py_ver_nodot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_nodot}-jinja2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # According to 'cmake --help-module FindBoost': "Note that Boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Python components require a Python version suffix (Boost 1.67
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and later), e.g. 'python36' or 'python27' for the versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # built against Python 3.6 and 2.7, respectively."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "/--Boost/,/--Jinja2/s/\(python\)/\\1${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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DPXR_ENABLE_PYTHON_SUPPORT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_ENABLE_PYTHON_SUPPORT=ON
</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 viewer \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requires usd_imaging python opengl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Build USD viewer} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${py_ver_nodot}-pyside \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_nodot}-opengl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DPXR_BUILD_USDVIEW=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_BUILD_USDVIEW=ON
</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 ptex description {Enable Ptex support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ptex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DPXR_ENABLE_PTEX_SUPPORT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_ENABLE_PTEX_SUPPORT=ON
</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 monolithic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Build the USD libraries as a single archive library, instead of modular individual libraries} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPXR_BUILD_MONOLITHIC=ON
</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;'>+### Imaging Plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant oiio description {Build OpenImageIO plugin} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:openimageio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPXR_BUILD_OPENIMAGEIO_PLUGIN=ON
</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 ocio description {Build OpenColorIO plugin} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:opencolorio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPXR_BUILD_OPENCOLORIO_PLUGIN=ON
</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 alembic description {Build the Alembic plugin for USD} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:alembic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPXR_BUILD_ALEMBIC_PLUGIN=ON
</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 hdf5 requires alembic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Enable HDF5 support in the Alembic plugin} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants alembic hdf5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DPXR_ENABLE_HDF5_SUPPORT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPXR_ENABLE_HDF5_SUPPORT_ON
</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 materialx description {Build MaterialX plugin} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:materialx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach re [list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/find_package.MaterialX/i\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\\ set(CMAKE_MODULE_PATH_ORIG \${CMAKE_MODULE_PATH})\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\\ list(PREPEND CMAKE_MODULE_PATH \"\${CMAKE_SOURCE_DIR}/cmake/modules\")\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/find_package.MaterialX/a\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\\ set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH_ORIG})\\
</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;'>+ reinplace $re ${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;'>+ reinplace -E {s|(stdlib_defs.mtlx)|share/MaterialX/libraries/stdlib/\1|} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/cmake/modules/FindMaterialX.cmake
</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;'>+ configure.args-append -DPXR_BUILD_MATERIALX_PLUGIN=ON
</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;'>+default_variants +docs +tests +ptex +oiio +ocio +alembic
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..52fae9d7e2a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,68 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pxr/base/lib/plug/initConfig.cpp.orig 2019-10-24 22:39:53.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pxr/base/lib/plug/initConfig.cpp 2019-12-11 11:00:37.643323127 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,8 +69,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARCH_CONSTRUCTOR(Plug_InitConfig, 2, void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* The contents of this constructor have been moved to usd_initialise_plugin_path(...) */
</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;'>++}; // end of anonymous namespace
</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;'>++ * The contents of this function used to be in the static constructor Plug_InitConfig.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * This static constructor made it impossible for Blender to pass a path to the USD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * library at runtime, as the constructor would run before Blender's main() function.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * This function is wrapped in a C function of the same name (defined below),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * so that it can be called from Blender's main() function.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * The datafiles_usd_path path is used to point to the USD plugin path when Blender
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * has been installed. The fallback_usd_path path should point to the build-time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * location of the USD plugin files so that Blender can be run on a development machine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * without requiring an installation step.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++usd_initialise_plugin_path(const char *datafiles_usd_path)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::vector<std::string> result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Add Blender-specific paths. They MUST end in a slash, or symlinks will not be treated as directory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (datafiles_usd_path != NULL && datafiles_usd_path[0] != '\0') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::string datafiles_usd_path_str(datafiles_usd_path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (datafiles_usd_path_str.back() != '/') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ datafiles_usd_path_str += "/";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result.push_back(datafiles_usd_path_str);
</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;'>+ // Determine the absolute path to the Plug shared library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Any relative paths specified in the plugin search path will be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // anchored to this directory, to allow for relocatability.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,9 +124,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _AppendPathList(&result, installLocation, sharedLibPath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // PXR_INSTALL_LOCATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Plug_SetPaths(result);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!TfGetenv("PXR_PATH_DEBUG").empty()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf("USD Plugin paths: (%zu in total):\n", result.size());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for(const std::string &path : result) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf(" %s\n", path.c_str());
</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;'>++ Plug_SetPaths(result);
</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_NAMESPACE_CLOSE_SCOPE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Workaround to make it possible to pass a path at runtime to USD. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++usd_initialise_plugin_path(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *datafiles_usd_path)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PXR_NS::usd_initialise_plugin_path(datafiles_usd_path);
</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;color:#808080;'>diff --git a/graphics/usd/files/patch-plugins-output-paths.diff b/graphics/usd/files/patch-plugins-output-paths.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..25860522633
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/macros/Private.cmake.orig 2019-10-24 16:39:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/macros/Private.cmake 2020-10-07 21:57:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,7 +92,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _get_resources_dir_name(PLUG_INFO_RESOURCE_PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PLUG_INFO_ROOT "..")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PLUG_INFO_PLUGIN_NAME "pxr.${libTarget}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PLUG_INFO_LIBRARY_PATH "${pluginToLibraryPath}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(PLUG_INFO_LIBRARY_PATH "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${plugInfoPath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1139,10 +1139,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _get_install_dir("include/${PXR_PREFIX}/${NAME}" headerInstallPrefix)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _get_install_dir("lib" libInstallPrefix)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(isPlugin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _get_install_dir("plugin" pluginInstallPrefix)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _get_install_dir("share/usd/plugins" pluginInstallPrefix)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT PXR_INSTALL_SUBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # XXX -- Why this difference?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _get_install_dir("plugin/usd" pluginInstallPrefix)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _get_install_dir("share/usd/plugins" pluginInstallPrefix)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT isObject)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # A plugin embedded in the monolithic library is found in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1233,7 +1233,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MFB_ALT_PACKAGE_NAME=${PXR_PACKAGE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MFB_PACKAGE_MODULE=${pythonModuleName}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PXR_BUILD_LOCATION=usd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PXR_PLUGIN_BUILD_LOCATION=../plugin/usd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PXR_PLUGIN_BUILD_LOCATION=../share/usd/plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${pxrInstallLocation}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${pythonModulesEnabled}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${apiPrivate}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/macros/Public.cmake.orig 2020-10-01 10:37:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/macros/Public.cmake 2020-10-03 18:11:35.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -766,7 +766,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${plugInfoContents}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILES "${CMAKE_CURRENT_BINARY_DIR}/usd_plugInfo.json"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION plugin/usd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION share/usd/plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RENAME "plugInfo.json"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endfunction() # pxr_setup_plugins
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ecd573807ab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/usd/files/patch-tests-output-paths.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,123 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/macros/Public.cmake.orig 2019-10-24 16:39:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/macros/Public.cmake 2020-10-01 10:37:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -391,7 +391,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RENAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __init__.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESTINATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tests/${tm_INSTALL_PREFIX}/lib/python/${MODULE_NAME}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ share/usd/tests/${tm_INSTALL_PREFIX}/lib/python/${MODULE_NAME}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${plugInfoFile}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -401,7 +401,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RENAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plugInfo.json
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESTINATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tests/${tm_INSTALL_PREFIX}/lib/python/${MODULE_NAME}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ share/usd/tests/${tm_INSTALL_PREFIX}/lib/python/${MODULE_NAME}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endfunction() # pxr_create_test_module
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -422,7 +422,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _pxr_target_link_libraries(${LIBRARY_NAME}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${bt_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _get_folder("tests/lib" folder)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _get_folder("share/usd/tests/lib" folder)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(${LIBRARY_NAME}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOLDER "${folder}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -430,7 +430,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Find libraries under the install prefix, which has the core USD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _pxr_init_rpath(rpath "tests/lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _pxr_init_rpath(rpath "share/usd/tests/lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _pxr_install_rpath(rpath ${LIBRARY_NAME})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -444,14 +444,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(TEST_PLUG_INFO_ROOT "..")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(LIBRARY_FILE "${CMAKE_SHARED_LIBRARY_PREFIX}${LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(testPlugInfoLibDir "tests/${bt_INSTALL_PREFIX}/lib/${LIBRARY_NAME}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(testPlugInfoLibDir "share/usd/tests/${bt_INSTALL_PREFIX}/lib/${LIBRARY_NAME}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(testPlugInfoResourceDir "${testPlugInfoLibDir}/${TEST_PLUG_INFO_RESOURCE_PATH}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(testPlugInfoPath "${CMAKE_BINARY_DIR}/${testPlugInfoResourceDir}/plugInfo.json")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file(RELATIVE_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEST_PLUG_INFO_LIBRARY_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${CMAKE_INSTALL_PREFIX}/${testPlugInfoLibDir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${CMAKE_INSTALL_PREFIX}/tests/lib/${LIBRARY_FILE}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${CMAKE_INSTALL_PREFIX}/share/usd/tests/lib/${LIBRARY_FILE}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_file("${testPlugInfoSrcPath}" "${testPlugInfoPath}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # XXX -- We shouldn't have to install to run tests.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -474,9 +474,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # XXX -- We shouldn't have to install to run tests.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGETS ${LIBRARY_NAME}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBRARY DESTINATION "tests/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ARCHIVE DESTINATION "tests/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RUNTIME DESTINATION "tests/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBRARY DESTINATION "share/usd/tests/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ARCHIVE DESTINATION "share/usd/tests/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RUNTIME DESTINATION "share/usd/tests/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endfunction() # pxr_build_test_shared_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -495,7 +495,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Turn PIC ON otherwise ArchGetAddressInfo() on Linux may yield
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # unexpected results.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _get_folder("tests/bin" folder)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _get_folder("share/usd/tests/bin" folder)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(${TEST_NAME}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOLDER "${folder}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -510,13 +510,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Find libraries under the install prefix, which has the core USD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _pxr_init_rpath(rpath "tests")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _pxr_init_rpath(rpath "share/usd/tests")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _pxr_install_rpath(rpath ${TEST_NAME})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # XXX -- We shouldn't have to install to run tests.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(TARGETS ${TEST_NAME}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RUNTIME DESTINATION "tests"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RUNTIME DESTINATION "share/usd/tests"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endfunction() # pxr_build_test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -536,7 +536,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # XXX -- We shouldn't have to install to run tests.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROGRAMS ${file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION share/usd/tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RENAME ${destFile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endforeach()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -554,7 +554,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # XXX -- We shouldn't have to install to run tests.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DIRECTORY ${bt_SRC}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION tests/ctest/${bt_DEST}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION share/usd/tests/ctest/${bt_DEST}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endfunction() # pxr_install_test_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -625,9 +625,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # assume the testenv has the same name as the test but allow it to be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # overridden by specifying TESTENV.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (bt_TESTENV)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(testenvDir ${CMAKE_INSTALL_PREFIX}/tests/ctest/${bt_TESTENV})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(testenvDir ${CMAKE_INSTALL_PREFIX}/share/usd/tests/ctest/${bt_TESTENV})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(testenvDir ${CMAKE_INSTALL_PREFIX}/tests/ctest/${TEST_NAME})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(testenvDir ${CMAKE_INSTALL_PREFIX}/share/usd/tests/ctest/${TEST_NAME})
</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;'>+ set(testWrapperCmd ${testWrapperCmd} --testenv-dir=${testenvDir})
</span></pre><pre style='margin:0'>
</pre>