LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Merge branch 'dks6' of https://git.psi.ch/nemu/musrfit into dks6

Browse Source
This commit is contained in:
suter_a 2018-06-06 07:50:16 +02:00
commit b0d9111039
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/musredit_qt5/musredit/PFitOutputHandler.cpp
View File

@ -64,7 +64,9 @@ PFitOutputHandler::PFitOutputHandler(QString workingDirectory, QVector<QString>
// make sure that the system environment variables are properly set // make sure that the system environment variables are properly set
QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH")); env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
env.value("DKS") + "/lib:" +
env.value("LD_LIBRARY_PATH"));
fProc->setProcessEnvironment(env); fProc->setProcessEnvironment(env);
fProc->setWorkingDirectory(workingDirectory); fProc->setWorkingDirectory(workingDirectory);

12
src/musredit_qt5/musredit/PTextEdit.cpp
View File

@ -2382,7 +2382,9 @@ void PTextEdit::musrView()
// make sure that the system environment variables are properly set // make sure that the system environment variables are properly set
QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH")); env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
env.value("DKS") + "/lib:" +
env.value("LD_LIBRARY_PATH"));
proc->setProcessEnvironment(env); proc->setProcessEnvironment(env);
proc->setWorkingDirectory(workDir); proc->setWorkingDirectory(workDir);
proc->start(cmd, arg); proc->start(cmd, arg);
@ -2436,7 +2438,9 @@ void PTextEdit::musrT0()
// make sure that the system environment variables are properly set // make sure that the system environment variables are properly set
QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH")); env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
env.value("DKS") + "/lib:" +
env.value("LD_LIBRARY_PATH"));
proc->setProcessEnvironment(env); proc->setProcessEnvironment(env);
proc->setWorkingDirectory(workDir); proc->setWorkingDirectory(workDir);
proc->start(cmd, arg); proc->start(cmd, arg);
@ -2473,7 +2477,9 @@ void PTextEdit::musrFT()
proc->setStandardErrorFile("musrFT.log"); proc->setStandardErrorFile("musrFT.log");
QString cmd = fAdmin->getExecPath() + "/musrFT"; QString cmd = fAdmin->getExecPath() + "/musrFT";
QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH")); env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
env.value("DKS") + "/lib:" +
env.value("LD_LIBRARY_PATH"));
proc->setProcessEnvironment(env); proc->setProcessEnvironment(env);
proc->start(cmd, fMusrFTPrevCmd); proc->start(cmd, fMusrFTPrevCmd);
if (!proc->waitForStarted()) { if (!proc->waitForStarted()) {