From e149f73d15aca311ae7c0c25956037fc4f0163bc Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Thu, 7 Mar 2024 12:31:32 +0100 Subject: [PATCH] for macos: add /usr/local/lib to DYLD_LIBRARY_PATH for qt5. This is needed to find the nexus lib. --- src/musredit_qt5/mupp/Pmupp.cpp | 2 +- src/musredit_qt5/mupp/PmuppGui.cpp | 2 +- src/musredit_qt5/mupp/PmuppScript.cpp | 2 +- src/musredit_qt5/musredit/PDumpOutputHandler.cpp | 2 +- src/musredit_qt5/musredit/PTextEdit.cpp | 12 ++++++------ src/musredit_qt6/musredit/PDumpOutputHandler.cpp | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/musredit_qt5/mupp/Pmupp.cpp b/src/musredit_qt5/mupp/Pmupp.cpp index ec6a51bd..b54c0cb9 100644 --- a/src/musredit_qt5/mupp/Pmupp.cpp +++ b/src/musredit_qt5/mupp/Pmupp.cpp @@ -297,7 +297,7 @@ bool PParamDataHandler::ReadParamFile(const QStringList fln, QString &errorMsg) QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); #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:/usr/local/lib:" + env.value("DYLD_LIBRARY_PATH")); #else env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH")); #endif diff --git a/src/musredit_qt5/mupp/PmuppGui.cpp b/src/musredit_qt5/mupp/PmuppGui.cpp index 488610c8..159307a2 100644 --- a/src/musredit_qt5/mupp/PmuppGui.cpp +++ b/src/musredit_qt5/mupp/PmuppGui.cpp @@ -2425,7 +2425,7 @@ 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")); + env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:/usr/local/lib:" + env.value("DYLD_LIBRARY_PATH")); #else env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH")); #endif diff --git a/src/musredit_qt5/mupp/PmuppScript.cpp b/src/musredit_qt5/mupp/PmuppScript.cpp index 887cff08..1c2a36be 100644 --- a/src/musredit_qt5/mupp/PmuppScript.cpp +++ b/src/musredit_qt5/mupp/PmuppScript.cpp @@ -522,7 +522,7 @@ int PmuppScript::plot(const QString str) QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); #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:/usr/local/lib:" + env.value("DYLD_LIBRARY_PATH")); #else env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH")); #endif diff --git a/src/musredit_qt5/musredit/PDumpOutputHandler.cpp b/src/musredit_qt5/musredit/PDumpOutputHandler.cpp index 9dc78759..10912ae6 100644 --- a/src/musredit_qt5/musredit/PDumpOutputHandler.cpp +++ b/src/musredit_qt5/musredit/PDumpOutputHandler.cpp @@ -63,7 +63,7 @@ PDumpOutputHandler::PDumpOutputHandler(QVector &cmd) // make sure that the system environment variables are properly set QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); #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:/usr/local/lib:" + env.value("DYLD_LIBRARY_PATH")); #else env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH")); #endif diff --git a/src/musredit_qt5/musredit/PTextEdit.cpp b/src/musredit_qt5/musredit/PTextEdit.cpp index 77f4aa62..932d0f46 100644 --- a/src/musredit_qt5/musredit/PTextEdit.cpp +++ b/src/musredit_qt5/musredit/PTextEdit.cpp @@ -1998,7 +1998,7 @@ void PTextEdit::musrWiz() // make sure that the system environment variables are properly set QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); #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:/usr/local/lib:" + env.value("DYLD_LIBRARY_PATH")); #else env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH")); #endif @@ -2559,7 +2559,7 @@ void PTextEdit::musrView() // make sure that the system environment variables are properly set QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); #if defined(Q_OS_DARWIN) - env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + + env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:/usr/local/lib:" + env.value("DKS") + "/lib:" + env.value("DYLD_LIBRARY_PATH")); #else @@ -2621,7 +2621,7 @@ void PTextEdit::musrT0() // make sure that the system environment variables are properly set QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); #if defined(Q_OS_DARWIN) - env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + + env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:/usr/local/lib:" + env.value("DKS") + "/lib:" + env.value("DYLD_LIBRARY_PATH")); #else @@ -2670,7 +2670,7 @@ void PTextEdit::musrFT() QString cmd = fAdmin->getExecPath() + "/musrFT"; QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); #if defined(Q_OS_DARWIN) - env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + + env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:/usr/local/lib:" + env.value("DKS") + "/lib:" + env.value("DYLD_LIBRARY_PATH")); #else @@ -2797,7 +2797,7 @@ void PTextEdit::musrSetSteps() // make sure that the system environment variables are properly set QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); #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:/usr/local/lib:" + env.value("DYLD_LIBRARY_PATH")); #else env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH")); #endif @@ -2968,7 +2968,7 @@ void PTextEdit::mupp() // make sure that the system environment variables are properly set QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); #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:/usr/local/lib:" + env.value("DYLD_LIBRARY_PATH")); #else env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH")); #endif diff --git a/src/musredit_qt6/musredit/PDumpOutputHandler.cpp b/src/musredit_qt6/musredit/PDumpOutputHandler.cpp index 88b4827f..5f3b9db7 100644 --- a/src/musredit_qt6/musredit/PDumpOutputHandler.cpp +++ b/src/musredit_qt6/musredit/PDumpOutputHandler.cpp @@ -63,7 +63,7 @@ PDumpOutputHandler::PDumpOutputHandler(QVector &cmd) // make sure that the system environment variables are properly set QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); #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:/usr/local/lib:" + env.value("DYLD_LIBRARY_PATH")); #else env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH")); #endif