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

adopted to dks6.

Browse Source
This commit is contained in:
suter_a 2021-11-05 14:40:44 +01:00
parent ebf60a8925
commit b377f0501e
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2641,17 +2641,15 @@ 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();
<<<<<<< HEAD #if defined(Q_OS_DARWIN)
env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
env.value("DKS") + "/lib:" +
env.value("DYLD_LIBRARY_PATH"));
#else
env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
env.value("DKS") + "/lib:" + env.value("DKS") + "/lib:" +
env.value("LD_LIBRARY_PATH")); env.value("LD_LIBRARY_PATH"));
=======
#if defined(Q_OS_DARWIN)
env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
#else
env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
#endif #endif
>>>>>>> c754275... adopted the the new dyld on macOS Monterey.
proc->setProcessEnvironment(env); proc->setProcessEnvironment(env);
proc->setWorkingDirectory(workDir); proc->setWorkingDirectory(workDir);
proc->start(cmd, arg); proc->start(cmd, arg);
@ -2688,17 +2686,15 @@ 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();
<<<<<<< HEAD
env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
env.value("DKS") + "/lib:" +
env.value("LD_LIBRARY_PATH"));
=======
#if defined(Q_OS_DARWIN) #if defined(Q_OS_DARWIN)
env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH")); env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
env.value("DKS") + "/lib:" +
env.value("DYLD_LIBRARY_PATH"));
#else #else
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"));
#endif #endif
>>>>>>> c754275... adopted the the new dyld on macOS Monterey.
proc->setProcessEnvironment(env); proc->setProcessEnvironment(env);
proc->start(cmd, fMusrFTPrevCmd); proc->start(cmd, fMusrFTPrevCmd);
if (!proc->waitForStarted()) { if (!proc->waitForStarted()) {