Skip to content

Commit

Permalink
Remove deprecated Houdini plugin from the USD repository
Browse files Browse the repository at this point in the history
This plugin has been deprecated in favor of Houdini's
native Solaris suite (also known as LOPs).

(Internal change: 2042211)
  • Loading branch information
pixar-oss committed Feb 18, 2020
1 parent 1228653 commit 67810b1
Show file tree
Hide file tree
Showing 159 changed files with 4 additions and 49,992 deletions.
4 changes: 0 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@ if (${PXR_BUILD_KATANA_PLUGIN})
add_subdirectory(third_party/katana)
endif()

if (${PXR_BUILD_HOUDINI_PLUGIN})
add_subdirectory(third_party/houdini)
endif()

if (${PXR_BUILD_PRMAN_PLUGIN})
add_subdirectory(third_party/renderman-${RENDERMAN_VERSION_MAJOR})
endif()
Expand Down
36 changes: 2 additions & 34 deletions build_scripts/build_usd.py
Original file line number Diff line number Diff line change
Expand Up @@ -1334,14 +1334,6 @@ def InstallUSD(context, force, buildArgs):
else:
extraArgs.append('-DPXR_BUILD_KATANA_PLUGIN=OFF')

if context.buildHoudini:
if context.houdiniLocation:
extraArgs.append('-DHOUDINI_ROOT="{houdiniLocation}"'
.format(houdiniLocation=context.houdiniLocation))
extraArgs.append('-DPXR_BUILD_HOUDINI_PLUGIN=ON')
else:
extraArgs.append('-DPXR_BUILD_HOUDINI_PLUGIN=OFF')

if Windows():
# Increase the precompiled header buffer limit.
extraArgs.append('-DCMAKE_CXX_FLAGS="/Zm150"')
Expand Down Expand Up @@ -1588,16 +1580,6 @@ def InstallUSD(context, force, buildArgs):
group.add_argument("--katana-api-location", type=str,
help="Directory where the Katana SDK is installed.")

group = parser.add_argument_group(title="Houdini Plugin Options")
subgroup = group.add_mutually_exclusive_group()
subgroup.add_argument("--houdini", dest="build_houdini", action="store_true",
default=False,
help="Build Houdini plugin for USD")
subgroup.add_argument("--no-houdini", dest="build_houdini", action="store_false",
help="Do not build Houdini plugin for USD (default)")
group.add_argument("--houdini-location", type=str,
help="Directory where Houdini is installed.")

args = parser.parse_args()

class InstallContext:
Expand Down Expand Up @@ -1710,11 +1692,6 @@ def __init__(self, args):
self.buildKatana = args.build_katana
self.katanaApiLocation = (os.path.abspath(args.katana_api_location)
if args.katana_api_location else None)

# - Houdini Plugin
self.buildHoudini = args.build_houdini
self.houdiniLocation = (os.path.abspath(args.houdini_location)
if args.houdini_location else None)

def GetBuildArguments(self, dep):
return self.buildArgs.get(dep.name.lower(), [])
Expand Down Expand Up @@ -1813,9 +1790,6 @@ def ForceBuildDependency(self, dep):
if not context.buildPython:
pythonPluginErrorMsg = (
"%s plugin cannot be built when python support is disabled")
if context.buildHoudini:
PrintError(pythonPluginErrorMsg % "Houdini")
sys.exit(1)
if context.buildKatana:
PrintError(pythonPluginErrorMsg % "Katana")
sys.exit(1)
Expand Down Expand Up @@ -1844,7 +1818,7 @@ def ForceBuildDependency(self, dep):

# We should not attempt to build the plugins for any other DCCs if we're
# building against Maya's version of Python.
if any([context.buildHoudini, context.buildKatana]):
if any([context.buildKatana]):
PrintError("Cannot build plugins for other DCCs when building against "
"Maya's version of Python.")
sys.exit(1)
Expand Down Expand Up @@ -1955,7 +1929,6 @@ def ForceBuildDependency(self, dep):
Draco Plugin {buildDraco}
MaterialX Plugin {buildMaterialX}
Katana Plugin {buildKatana}
Houdini Plugin {buildHoudini}
Dependencies {dependencies}"""

Expand Down Expand Up @@ -2004,8 +1977,7 @@ def FormatBuildArguments(buildArgs):
buildDraco=("On" if context.buildDraco else "Off"),
buildMaterialX=("On" if context.buildMaterialX else "Off"),
enableHDF5=("On" if context.enableHDF5 else "Off"),
buildKatana=("On" if context.buildKatana else "Off"),
buildHoudini=("On" if context.buildHoudini else "Off"))
buildKatana=("On" if context.buildKatana else "Off"))

Print(summaryMsg)

Expand Down Expand Up @@ -2084,10 +2056,6 @@ def FormatBuildArguments(buildArgs):
Print("See documentation at http://openusd.org/docs/Katana-USD-Plugins.html "
"for setting up the Katana plugin.\n")

if context.buildHoudini:
Print("See documentation at http://openusd.org/docs/Houdini-USD-Plugins.html "
"for setting up the Houdini plugin.\n")

if context.buildPrman:
Print("See documentation at http://openusd.org/docs/RenderMan-USD-Imaging-Plugin.html "
"for setting up the RenderMan plugin.\n")
10 changes: 0 additions & 10 deletions cmake/defaults/Options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ option(PXR_BUILD_USDVIEW "Build usdview" ON)
option(PXR_BUILD_KATANA_PLUGIN "Build usd katana plugin" OFF)
option(PXR_BUILD_ALEMBIC_PLUGIN "Build the Alembic plugin for USD" OFF)
option(PXR_BUILD_DRACO_PLUGIN "Build the Draco plugin for USD" OFF)
option(PXR_BUILD_HOUDINI_PLUGIN "Build the Houdini plugin for USD" OFF)
option(PXR_BUILD_PRMAN_PLUGIN "Build the PRMan imaging plugin" OFF)
option(PXR_BUILD_MATERIALX_PLUGIN "Build the MaterialX plugin for USD" OFF)
option(PXR_BUILD_DOCUMENTATION "Generate doxygen documentation" OFF)
Expand Down Expand Up @@ -171,15 +170,6 @@ if (${PXR_BUILD_KATANA_PLUGIN})
endif()
endif()

if (${PXR_BUILD_HOUDINI_PLUGIN})
if (NOT ${PXR_ENABLE_PYTHON_SUPPORT})
message(STATUS
"Setting PXR_BUILD_HOUDINI_PLUGIN=OFF because "
"PXR_ENABLE_PYTHON_SUPPORT=OFF")
set(PXR_BUILD_HOUDINI_PLUGIN "OFF" CACHE BOOL "" FORCE)
endif()
endif()

if (${PXR_BUILD_PRMAN_PLUGIN})
if (NOT ${PXR_BUILD_IMAGING})
message(STATUS
Expand Down
4 changes: 0 additions & 4 deletions cmake/defaults/Packages.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,6 @@ if (PXR_BUILD_KATANA_PLUGIN)
)
endif()

if (PXR_BUILD_HOUDINI_PLUGIN)
find_package(Houdini REQUIRED)
endif()

if (PXR_BUILD_PRMAN_PLUGIN)
find_package(Renderman REQUIRED)
endif()
Expand Down
156 changes: 0 additions & 156 deletions cmake/modules/FindHoudini.cmake

This file was deleted.

28 changes: 0 additions & 28 deletions third_party/houdini/CMakeLists.txt

This file was deleted.

8 changes: 2 additions & 6 deletions third_party/houdini/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
Houdini Plugins
===============

This section contains libraries and plugins for Houdini.

See the [online documentation](http://openusd.org/docs/Houdini-USD-Plugins.html) for more details.
The USD Houdini plugins have been deprecated in favor of Houdini's
native Solaris suite (also known as LOPs).
Loading

0 comments on commit 67810b1

Please sign in to comment.