diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-02-08 09:22:06 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-08 09:22:06 +0300 |
commit | 914e2ee01f35edc60ffa20d84a198c757cfa31da (patch) | |
tree | ef1bb039275adac072f8b66d048c7ca5563e947c | |
parent | 9d6f9e74d4ad76269146e36697a21679c7d5aaa5 (diff) |
problem with blender and python 3.2
- python 3.2 does 'import site' on startup which now tries to parse pyconfig.h which isn't copied. so for now just run without importing 'site', alternative would be to copy the header file for posix systems.
- cache PYTHON_VERSION variable so it can be set to 3.2, needed for copying python installation's other then 3.1.
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_interface.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 55bfb83a6e6..3b409a07652 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -226,7 +226,7 @@ if(UNIX AND NOT APPLE) # No way to set py31. remove for now. # find_package(PythonLibs) set(PYTHON /usr) - set(PYTHON_VERSION 3.1) + set(PYTHON_VERSION 3.1 CACHE STRING "") set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "") mark_as_advanced(PYTHON_INCLUDE_DIRS) # set(PYTHON_BINARY python) # not used yet diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 776f2da8507..5c4add0e547 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -230,6 +230,11 @@ void BPY_python_start( int argc, char **argv ) BPY_python_start_path(); /* allow to use our own included python */ + /* Python 3.2 now looks for '2.56/python/include/python3.2d/pyconfig.h' to parse + * from the 'sysconfig' module which is used by 'site', so for now disable site. + * alternatively we could copy the file. */ + Py_NoSiteFlag= 1; + Py_Initialize( ); // PySys_SetArgv( argc, argv); // broken in py3, not a huge deal |