Add --pythonhome Arg

src/CutterApplication.cpp

@@ -9,6 +9,10 @@
 #include <QStringList>
 #include <QProcess>
 
+#ifdef CUTTER_ENABLE_JUPYTER
+#include "utils/JupyterConnection.h"
+#endif
+
 CutterApplication::CutterApplication(int &argc, char **argv) : QApplication(argc, argv){
     setOrganizationName("Cutter");
     setApplicationName("Cutter");
@@ -32,6 +36,11 @@ CutterApplication::CutterApplication(int &argc, char **argv) : QApplication(argc
                                    QObject::tr("level"));
     cmd_parser.addOption(analOption);
 
+#ifdef CUTTER_ENABLE_JUPYTER
+    QCommandLineOption pythonHomeOption("pythonhome", QObject::tr("PYTHONHOME to use for Jupyter"), "PYTHONHOME");
+    cmd_parser.addOption(pythonHomeOption);
+#endif
+
     cmd_parser.process(*this);
 
     QStringList args = cmd_parser.positionalArguments();
@@ -50,6 +59,13 @@ CutterApplication::CutterApplication(int &argc, char **argv) : QApplication(argc
             exit(1);
     }
 
+#ifdef CUTTER_ENABLE_JUPYTER
+    if (cmd_parser.isSet(pythonHomeOption))
+    {
+        Jupyter()->setPythonHome(cmd_parser.value(pythonHomeOption));
+    }
+#endif
+
     bool analLevelSpecified = false;
     int analLevel= 0;
 

src/utils/JupyterConnection.cpp

@@ -52,6 +52,8 @@ JupyterConnection::~JupyterConnection()
 void JupyterConnection::initPython()
 {
 #if defined(APPIMAGE) || defined(MACOS_PYTHON_FRAMEWORK_BUNDLED)
+    if(customPythonHome.isNull())
+    {
         auto pythonHomeDir = QDir(QCoreApplication::applicationDirPath());
 #   ifdef APPIMAGE
             // Executable is in appdir/bin
@@ -62,11 +64,17 @@ void JupyterConnection::initPython()
             pythonHomeDir.cd("../Frameworks/Python.framework/Versions/Current");
             qInfo() << "Setting PYTHONHOME =" << pythonHomeDir.absolutePath() << " for macOS Application Bundle.";
 #   endif
-    QString pythonHomeStr = pythonHomeDir.absolutePath();
+        customPythonHome = pythonHomeDir.absolutePath();
-    pythonHome = Py_DecodeLocale(pythonHomeStr.toLocal8Bit().constData(), nullptr);
+    }
-    Py_SetPythonHome(pythonHome);
 #endif
 
+    if(!customPythonHome.isNull())
+    {
+        qInfo() << "PYTHONHOME =" << customPythonHome;
+        pythonHome = Py_DecodeLocale(customPythonHome.toLocal8Bit().constData(), nullptr);
+        Py_SetPythonHome(pythonHome);
+    }
+
     PyImport_AppendInittab("cutter", &PyInit_api);
     PyImport_AppendInittab("cutter_internal", &PyInit_api_internal);
     Py_Initialize();

src/utils/JupyterConnection.h

@@ -25,6 +25,8 @@ public:
     JupyterConnection(QObject *parent = nullptr);
     ~JupyterConnection();
 
+    void setPythonHome(const QString pythonHome)    { customPythonHome = pythonHome; }
+
     void start();
     QString getUrl();
 
@@ -45,6 +47,8 @@ private:
     QMap<long, NestedIPyKernel *> kernels;
     long nextKernelId = 1;
 
+    QString customPythonHome;
+
     wchar_t *pythonHome = nullptr;
 
     void initPython();