Manage Houdini python modules

rodeofx · Apr 25, 2019 · 8cef5cb · 8cef5cb
1 parent 8a41445
commit 8cef5cb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/cmake/defaults/pxrConfigHoudini.cmake b/cmake/defaults/pxrConfigHoudini.cmake
@@ -2,6 +2,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 
 set(PXR_INCLUDE_DIRS ${USD_LOCATION}/toolkit/include)
 set(USD_PLUGINS_DIR ${USD_LOCATION}/dsolib/usd_plugins)
+set(USD_PYTHONPATH ${USD_LOCATION}/python/lib/python2.7/site-packages)
 
 set(_DSOLIB_DIR "${USD_LOCATION}/dsolib")
 set(_PYTHONLIB_DIR "${USD_LOCATION}/python/lib")

diff --git a/cmake/modules/FindUSD.cmake b/cmake/modules/FindUSD.cmake
@@ -3,6 +3,7 @@ if(USE_HOUDINI_USD)
 elseif(EXISTS ${USD_LOCATION}/pxrConfig.cmake)
   include(${USD_LOCATION}/pxrConfig.cmake)
   set(USD_PLUGINS_DIR ${USD_LOCATION}/plugin/usd)
+  set(USD_PYTHONPATH ${USD_LOCATION}/lib/python)
 endif()
 
 include(FindPackageHandleStandardArgs)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -130,7 +130,7 @@ install(
 # Tests
 
 set(TESTS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/testenv)
-set(_testPYTHONPATH "PYTHONPATH=${INSTALL_PYTHONPACKAGE_DIR}/..:${USD_LOCATION}/lib/python:$ENV{PYTHONPATH}")
+set(_testPYTHONPATH "PYTHONPATH=${INSTALL_PYTHONPACKAGE_DIR}/..:${USD_PYTHONPATH}:$ENV{PYTHONPATH}")
 set(_testPXR_PLUGINPATH_NAME "PXR_PLUGINPATH_NAME=${CMAKE_INSTALL_PREFIX}/plugin/usd:${PXR_PLUGINPATH_NAME}")
 
 if(APPLE)