diff options
Diffstat (limited to 'boost_python2.patch')
| -rw-r--r-- | boost_python2.patch | 74 |
1 files changed, 26 insertions, 48 deletions
diff --git a/boost_python2.patch b/boost_python2.patch index 82692cf28742..4b5506353cee 100644 --- a/boost_python2.patch +++ b/boost_python2.patch @@ -1,30 +1,8 @@ -diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake -index 9be215b36..031c64ab0 100644 ---- a/cmake/defaults/Packages.cmake -+++ b/cmake/defaults/Packages.cmake -@@ -43,12 +43,16 @@ if(PXR_ENABLE_PYTHON_SUPPORT) - find_package(PythonLibs 2.7 REQUIRED) - - # --Boost -+ # replace 'python' with 'python27' as boost>=1.67 require python version suffix -+ # https://cmake.org/cmake/help/v3.15/module/FindBoost.html - find_package(Boost - COMPONENTS - program_options -- python -+ python27 - REQUIRED - ) -+ # fix rest of code expecting 'Boost_PYTHON_LIBRARY' -+ set(Boost_PYTHON_LIBRARY "${Boost_PYTHON27_LIBRARY}") - - # --Jinja2 - find_package(Jinja2) diff --git a/cmake/macros/Private.cmake b/cmake/macros/Private.cmake -index 32274b3f4..d6ee46b51 100644 +index 6d97fe82e..feffd80c9 100644 --- a/cmake/macros/Private.cmake +++ b/cmake/macros/Private.cmake -@@ -120,7 +120,7 @@ function(_install_python LIBRARY_NAME) +@@ -118,7 +118,7 @@ function(_install_python LIBRARY_NAME) ${ARGN} ) @@ -33,7 +11,7 @@ index 32274b3f4..d6ee46b51 100644 _get_python_module_name(${LIBRARY_NAME} LIBRARY_INSTALLNAME) set(files_copied "") -@@ -268,7 +268,7 @@ function(_install_pyside_ui_files LIBRARY_NAME) +@@ -266,7 +266,7 @@ function(_install_pyside_ui_files LIBRARY_NAME) FOLDER "${folder}" ) @@ -42,7 +20,7 @@ index 32274b3f4..d6ee46b51 100644 _get_python_module_name(${LIBRARY_NAME} LIBRARY_INSTALLNAME) install( -@@ -947,7 +947,7 @@ function(_pxr_python_module NAME) +@@ -953,7 +953,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. @@ -52,49 +30,49 @@ index 32274b3f4..d6ee46b51 100644 # Python modules need to be able to access their corresponding # wrapped library and the install lib directory. diff --git a/cmake/macros/Public.cmake b/cmake/macros/Public.cmake -index ed9ae9a31..f9c023f44 100644 +index 0e05c5f37..0342e7b7a 100644 --- a/cmake/macros/Public.cmake +++ b/cmake/macros/Public.cmake -@@ -350,7 +350,7 @@ function(pxr_setup_python) +@@ -362,7 +362,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/python2.7/site-packages/pxr installPrefix) ++ _get_install_dir(lib/python2.7/pxr installPrefix) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/generated_modules_init.py" "__all__ = [${pyModulesStr}]\n") -@@ -391,7 +391,7 @@ function (pxr_create_test_module MODULE_NAME) +@@ -409,7 +409,7 @@ function (pxr_create_test_module MODULE_NAME) RENAME __init__.py DESTINATION - tests/${tm_INSTALL_PREFIX}/lib/python/${MODULE_NAME} -+ tests/${tm_INSTALL_PREFIX}/lib/python2.7/site-packages/pxr/${MODULE_NAME} ++ tests/${tm_INSTALL_PREFIX}/lib/python2.7/${MODULE_NAME} ) endif() if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${plugInfoFile}") -@@ -401,7 +401,7 @@ function (pxr_create_test_module MODULE_NAME) +@@ -419,7 +419,7 @@ function (pxr_create_test_module MODULE_NAME) RENAME plugInfo.json DESTINATION - tests/${tm_INSTALL_PREFIX}/lib/python/${MODULE_NAME} -+ tests/${tm_INSTALL_PREFIX}/lib/python2.7/site-packages/pxr/${MODULE_NAME} ++ tests/${tm_INSTALL_PREFIX}/lib/python2.7/${MODULE_NAME} ) endif() endfunction() # pxr_create_test_module -@@ -704,7 +704,7 @@ function(pxr_register_test TEST_NAME) - # Ensure that Python imports the Python files built by this build. - # On Windows convert backslash to slash and don't change semicolons - # to colons. -- set(_testPythonPath "${CMAKE_INSTALL_PREFIX}/lib/python;$ENV{PYTHONPATH}") -+ set(_testPythonPath "${CMAKE_INSTALL_PREFIX}/lib/python2.7/site-packages/pxr;$ENV{PYTHONPATH}") - if(WIN32) - string(REGEX REPLACE "\\\\" "/" _testPythonPath "${_testPythonPath}") - else() -diff --git a/pxr/base/lib/plug/testPlug.py b/pxr/base/lib/plug/testPlug.py +@@ -763,7 +763,7 @@ function(pxr_register_test TEST_NAME) + # Ensure that Python imports the Python files built by this build. + # On Windows convert backslash to slash and don't change semicolons + # to colons. +- set(_testPythonPath "${CMAKE_INSTALL_PREFIX}/lib/python;$ENV{PYTHONPATH}") ++ set(_testPythonPath "${CMAKE_INSTALL_PREFIX}/lib/python2.7;$ENV{PYTHONPATH}") + if(WIN32) + string(REGEX REPLACE "\\\\" "/" _testPythonPath "${_testPythonPath}") + else() +diff --git a/pxr/base/plug/testPlug.py b/pxr/base/plug/testPlug.py index 377e66632..776a1317a 100644 ---- a/pxr/base/lib/plug/testPlug.py -+++ b/pxr/base/lib/plug/testPlug.py +--- a/pxr/base/plug/testPlug.py ++++ b/pxr/base/plug/testPlug.py @@ -32,7 +32,7 @@ from pxr import Plug, Tf, Gf # Test plugins are installed relative to this script testRoot = os.path.join(os.path.dirname(__file__), 'PlugPlugins') @@ -104,10 +82,10 @@ index 377e66632..776a1317a 100644 testPluginsDsoSearch = testPluginsDso + '/*/Resources/' testPluginsPythonSearch = testPluginsPython + '/**/' -diff --git a/pxr/usdImaging/lib/usdviewq/CMakeLists.txt b/pxr/usdImaging/lib/usdviewq/CMakeLists.txt +diff --git a/pxr/usdImaging/usdviewq/CMakeLists.txt b/pxr/usdImaging/usdviewq/CMakeLists.txt index 66c5b2091..91c878bf3 100644 ---- a/pxr/usdImaging/lib/usdviewq/CMakeLists.txt -+++ b/pxr/usdImaging/lib/usdviewq/CMakeLists.txt +--- a/pxr/usdImaging/usdviewq/CMakeLists.txt ++++ b/pxr/usdImaging/usdviewq/CMakeLists.txt @@ -80,7 +80,7 @@ pxr_library(usdviewq install(DIRECTORY |