diff --git a/cmake/test.cmake b/cmake/test.cmake index a9deb37892..93fd8f22a7 100644 --- a/cmake/test.cmake +++ b/cmake/test.cmake @@ -191,6 +191,12 @@ finally: list(APPEND mayaUsd_varname_PXR_PLUGINPATH_NAME "${CMAKE_INSTALL_PREFIX}/plugin/al/plugin") + if(IS_WINDOWS AND DEFINED ENV{PYTHONHOME}) + # If the environment contains a PYTHONHOME, also set the path to + # that folder so that we can find the python DLLs. + list(APPEND mayaUsd_varname_PATH $ENV{PYTHONHOME}) + endif() + # inherit PATH and PYTHONPATH from ENV to get USD entries # these should come last (esp PYTHONPATH, in case another module is overriding # with pkgutil) diff --git a/cmake/utils.cmake b/cmake/utils.cmake index 390ab6388d..5af015ebc7 100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -68,7 +68,7 @@ function(mayaUsd_find_python_module module) set(${module}_FIND_REQUIRED TRUE) endif() execute_process(COMMAND "${Python_EXECUTABLE}" "-c" - "import re, ${module}; print re.compile('/__init__.py.*').sub('',${module}.__file__)" + "from __future__ import print_function; import re, ${module}; print(re.compile('/__init__.py.*').sub('',${module}.__file__))" RESULT_VARIABLE _${module}_status OUTPUT_VARIABLE _${module}_location ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)