Differential D11047 Diff 28102 files/python-site-packages.patch

Changeset View

Standalone View

files/python-site-packages.patch

This file was added.

				--- a/cmake/macros/Private.cmake
				+++ b/cmake/macros/Private.cmake
				@@ -118,7 +118,7 @@ function(_install_python LIBRARY_NAME)
				${ARGN}
				)

				- set(libPythonPrefix lib/python)
				+ set(libPythonPrefix lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
				_get_python_module_name(${LIBRARY_NAME} LIBRARY_INSTALLNAME)

				set(files_copied "")
				@@ -285,7 +285,7 @@ function(_install_pyside_ui_files LIBRAR
				FOLDER "${folder}"
				)

				- set(libPythonPrefix lib/python)
				+ set(libPythonPrefix lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
				_get_python_module_name(${LIBRARY_NAME} LIBRARY_INSTALLNAME)

				install(
				@@ -940,7 +940,7 @@ function(_pxr_python_module NAME)
				# 'from pxr import X'. Additionally, python libraries always install
				# into the default lib install, not into the third_party subdirectory
				# or similar.
				- set(libInstallPrefix "lib/python/pxr/${pyModuleName}")
				+ set(libInstallPrefix "lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/pxr/${pyModuleName}")

				# Python modules need to be able to access their corresponding
				# wrapped library and the install lib directory.
				--- a/cmake/macros/Public.cmake
				+++ b/cmake/macros/Public.cmake
				@@ -374,7 +374,7 @@ function(pxr_setup_python)
				string(REPLACE ";" ", " pyModulesStr "${converted}")

				# Install a pxr __init__.py with an appropriate __all__
				- _get_install_dir(lib/python/pxr installPrefix)
				+ _get_install_dir(lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/pxr installPrefix)

				file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/generated_modules_init.py"
				"__all__ = [${pyModulesStr}]\n")
				--- a/pxr/usdImaging/usdviewq/CMakeLists.txt
				+++ b/pxr/usdImaging/usdviewq/CMakeLists.txt
				@@ -85,12 +85,12 @@ pxr_library(usdviewq

				install(DIRECTORY
				icons
				- DESTINATION lib/python/pxr/Usdviewq
				+ DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/pxr/Usdviewq
				)

				install(DIRECTORY
				fonts
				- DESTINATION lib/python/pxr/Usdviewq
				+ DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/pxr/Usdviewq
				)

				pxr_test_scripts(