OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Python: add extra path to PythonPath for Linux

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-07-30 14:31:45 +02:00
parent 20832dfc88
commit 010b573afb
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/Application/RiaApplication.cpp
+8 -3
View File
@@ -95,6 +95,8 @@
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
#include <iostream>
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#else #else
@@ -950,15 +952,18 @@ QProcessEnvironment RiaApplication::pythonProcessEnvironment() const
penv.insert("RESINSIGHT_EXECUTABLE", QCoreApplication::applicationFilePath()); penv.insert("RESINSIGHT_EXECUTABLE", QCoreApplication::applicationFilePath());
QStringList ripsLocations; QStringList ripsLocations;
QString separator;
#ifdef WIN32 #ifdef WIN32
ripsLocations << QCoreApplication::applicationDirPath() + "\\Python" ripsLocations << QCoreApplication::applicationDirPath() + "\\Python"
<< QCoreApplication::applicationDirPath() + "\\..\\..\\Python"; << QCoreApplication::applicationDirPath() + "\\..\\..\\Python";
separator = ";";
#else #else
ripsLocations << QCoreApplication::applicationDirPath() + "/Python"; ripsLocations << QCoreApplication::applicationDirPath() + "/Python"
<< QCoreApplication::applicationDirPath() + "/../../Python";
separator = ":";
#endif #endif
penv.insert("PYTHONPATH", QString("%1%2%3").arg(penv.value("PYTHONPATH")).arg(separator).arg(ripsLocations.join(separator)));
penv.insert("PYTHONPATH", QString("%1;%2").arg(penv.value("PYTHONPATH")).arg(ripsLocations.join(";")));
#endif #endif
return penv; return penv;
} }