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

adopted the the new dyld on macOS Monterey.

Browse Source
This commit is contained in:
suter_a
2021-11-05 14:06:20 +01:00
parent 87bee52edb
commit c988f00ad8
14 changed files with 110 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/musredit_qt6/mupp/Pmupp.cpp
View File

@@ -297,7 +297,11 @@ bool PParamDataHandler::ReadParamFile(const QStringList fln, QString &errorMsg)
connect( fProc, SIGNAL( finished(int, QProcess::ExitStatus) ), this, SLOT( processDone(int, QProcess::ExitStatus) ) );
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
#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
cmd = env.value("MUSRFITPATH") + QString("/msr2data");
if (!QFile::exists(cmd)) { // MUSRFITPATH not set?
// try ROOTSYS

6
src/musredit_qt6/mupp/PmuppGui.cpp
View File

@@ -2226,7 +2226,7 @@ void PmuppGui::startMuppPlot()
{
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QString cmd = QString("%1/bin/mupp_plot").arg(MUPP_PREFIX);
#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
#if defined(Q_OS_DARWIN)
cmd = QString("/Applications/mupp.app/Contents/MacOS/mupp_plot");
#endif
QString workDir = QString("./");
@@ -2242,7 +2242,11 @@ void PmuppGui::startMuppPlot()
}
// make sure that the system environment variables are properly set
#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
fMuppPlot->setProcessEnvironment(env);
fMuppPlot->setWorkingDirectory(workDir);
fMuppPlot->start(cmd, arg);

4
src/musredit_qt6/mupp/PmuppScript.cpp
View File

@@ -512,7 +512,11 @@ int PmuppScript::plot(const QString str)
arg << "-q";
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
#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
proc->setProcessEnvironment(env);
proc->setWorkingDirectory(fSavePath);
proc->start(exec_cmd, arg);