haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initialize Py_SetPythonHome for msvc/vcpkg

This commit is contained in:
Mark Roszko 2020-09-23 00:02:32 +00:00 committed by Seth Hillbrand
parent 1c2ab0f523
commit 610f0372d3
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcbnew/swig/python_scripting.cpp
View File

@ -162,6 +162,24 @@ bool pcbnewInitPythonScripting( const char * aUserScriptingPath )
swigAddModules(); // add our own modules swigAddModules(); // add our own modules
swigSwitchPythonBuiltin(); // switch the python builtin modules to our new list swigSwitchPythonBuiltin(); // switch the python builtin modules to our new list
#ifdef _MSC_VER
// Under vcpkg/msvc, we need to explicitly set the python home
// or else it'll start consuming system python registry keys and the like instead
// We are going to follow the "unix" layout for the msvc/vcpkg distributions so exes in /root/bin
// And the python lib in /root/share/python3(/Lib,/DLLs)
wxFileName pyHome;
pyHome.Assign( Pgm().GetExecutablePath() );
pyHome.AppendDir( wxT("..") );
pyHome.AppendDir( wxT("share") );
pyHome.AppendDir( wxT("python3") );
pyHome.Normalize();
// MUST be called before Py_Initialize so it will to create valid default lib paths
Py_SetPythonHome( pyHome.GetFullPath().c_str() );
#endif
Py_Initialize(); Py_Initialize();
PySys_SetArgv( Pgm().App().argc, Pgm().App().argv ); PySys_SetArgv( Pgm().App().argc, Pgm().App().argv );