[rkward/frameworks] rkward: Fix breakage from last commit
Thomas Friedrichsmeier
null at kde.org
Tue May 16 13:46:36 UTC 2017
Git commit 35c2986c446b77e9132e211248ec90d85a73ca05 by Thomas Friedrichsmeier.
Committed on 16/05/2017 at 13:46.
Pushed by tfry into branch 'frameworks'.
Fix breakage from last commit
M +13 -13 rkward/main.cpp
M +1 -1 rkward/rbackend/CMakeLists.txt
https://commits.kde.org/rkward/35c2986c446b77e9132e211248ec90d85a73ca05
diff --git a/rkward/main.cpp b/rkward/main.cpp
index 487d8c08..1a6a0d02 100644
--- a/rkward/main.cpp
+++ b/rkward/main.cpp
@@ -224,6 +224,19 @@ int main (int argc, char *argv[]) {
RKGlobals::startup_options["evaluate"] = parser.value ("evaluate");
RKGlobals::startup_options["backend-debugger"] = parser.value ("backend-debugger");
+ // MacOS may need some path adjustments, first
+#ifdef Q_OS_MAC
+ QString oldpath = qgetenv ("PATH");
+ if (!oldpath.contains (INSTALL_PATH)) {
+ //ensure that PATH is set to include what we deliver with the bundle
+ qputenv ("PATH", QString ("%1/bin:%1/sbin:%2").arg (INSTALL_PATH).arg (oldpath).toLocal8Bit ());
+ if (debug_level > 3) qDebug ("Adjusting system path to %s", qPrintable (qgetenv ("PATH")));
+ }
+ // ensure that RKWard finds its own packages
+ qputenv ("R_LIBS", R_LIBS);
+ QProcess::execute ("launchctl", QStringList () << "load" << "-w" << INSTALL_PATH "/Library/LaunchAgents/org.freedesktop.dbus-session.plist");
+#endif
+
// Handle --reuse option, by placing a dbus-call to existing RKWard process (if any) and exiting
if (parser.isSet ("reuse")) {
if (!QDBusConnection::sessionBus ().isConnected ()) {
@@ -241,19 +254,6 @@ int main (int argc, char *argv[]) {
}
}
-// MacOS may need some path adjustments, first
-#ifdef Q_OS_MAC
- QString oldpath = qgetenv ("PATH");
- if (!oldpath.contains (INSTALL_PATH)) {
- //ensure that PATH is set to include what we deliver with the bundle
- qputenv ("PATH", QString ("%1/bin:%1/sbin:%2").arg (INSTALL_PATH).arg (oldpath).toLocal8Bit ());
- if (debug_level > 3) qDebug ("Adjusting system path to %s", qPrintable (qgetenv ("PATH")));
- }
- // ensure that RKWard finds its own packages
- qputenv ("R_LIBS", R_LIBS);
- QProcess::execute ("launchctl", QStringList () << "load" << "-w" << INSTALL_PATH "/Library/LaunchAgents/org.freedesktop.dbus-session.plist");
-#endif
-
// Locate KDE and RKWard installations
QString marker_exe_name ("qtpaths"); // Simply some file that should exist in the bin dir of a KDE installation on both Unix and Windows
QString marker_exe = findExeAtPath (marker_exe_name, QDir::currentPath ());
diff --git a/rkward/rbackend/CMakeLists.txt b/rkward/rbackend/CMakeLists.txt
index 52a9fe0d..77786cf7 100644
--- a/rkward/rbackend/CMakeLists.txt
+++ b/rkward/rbackend/CMakeLists.txt
@@ -63,5 +63,5 @@ IF(WIN32)
# all the KDE library versions, first, when loading DLLs
INSTALL(TARGETS rkward.rbackend DESTINATION ${BIN_INSTALL_DIR}/rbackend)
ELSE(WIN32)
- INSTALL(TARGETS rkward.rbackend DESTINATION ${RKWARD_FRONTEND_LOCATION})
+ INSTALL(TARGETS rkward.rbackend DESTINATION ${LIBEXEC_INSTALL_DIR})
ENDIF(WIN32)
More information about the rkward-tracker
mailing list