From 9871f23d7a9104c7c67c8739a752d5040f258fdc Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Wed, 6 Jun 2018 07:49:27 +0200 Subject: [PATCH] added DKS environment variable to the process. --- src/musredit_qt5/musredit/PFitOutputHandler.cpp | 4 +++- src/musredit_qt5/musredit/PTextEdit.cpp | 12 +++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/musredit_qt5/musredit/PFitOutputHandler.cpp b/src/musredit_qt5/musredit/PFitOutputHandler.cpp index 76d453f9..8c930e92 100644 --- a/src/musredit_qt5/musredit/PFitOutputHandler.cpp +++ b/src/musredit_qt5/musredit/PFitOutputHandler.cpp @@ -64,7 +64,9 @@ PFitOutputHandler::PFitOutputHandler(QString workingDirectory, QVector // make sure that the system environment variables are properly set 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->setWorkingDirectory(workingDirectory); diff --git a/src/musredit_qt5/musredit/PTextEdit.cpp b/src/musredit_qt5/musredit/PTextEdit.cpp index 2c2af2ef..da28d5c7 100644 --- a/src/musredit_qt5/musredit/PTextEdit.cpp +++ b/src/musredit_qt5/musredit/PTextEdit.cpp @@ -2382,7 +2382,9 @@ void PTextEdit::musrView() // make sure that the system environment variables are properly set 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->setWorkingDirectory(workDir); proc->start(cmd, arg); @@ -2436,7 +2438,9 @@ void PTextEdit::musrT0() // make sure that the system environment variables are properly set 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->setWorkingDirectory(workDir); proc->start(cmd, arg); @@ -2473,7 +2477,9 @@ void PTextEdit::musrFT() proc->setStandardErrorFile("musrFT.log"); QString cmd = fAdmin->getExecPath() + "/musrFT"; 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->start(cmd, fMusrFTPrevCmd); if (!proc->waitForStarted()) {