A couple of minor fixes for python3 support. #564
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
seando-adsk
commented
Jun 4, 2020
Comment on lines
+194
to
+198
| 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() |
There was a problem hiding this comment.
@HamedSabri-adsk As we discussed, when the PYTHONHOME env var is set (which we'll do from our internal builds) we also add that to the path. This is so the tests can find the python37.dll
| @@ -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__))" | |||
There was a problem hiding this comment.
The python code is used to determine if a given module (such as jinja2) exists. It needed to be made python3 compatible.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.