qapitrace: Determine binary dir in run-time.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e31cb54fe51a1a7b522f252dd6a81b801098172f..4963bd5c64b954d574cb9fc503188bdfaf77f953 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -274,7 +274,6 @@ set (WRAPPER_INSTALL_DIR ${LIB_ARCH_INSTALL_DIR}/wrappers)
 # so that binaries can find each other using just relative paths.
 #
 add_definitions(
-    -DAPITRACE_BINARY_DIR="${CMAKE_BINARY_DIR}"
     -DAPITRACE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"
     -DAPITRACE_PROGRAMS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/bin"
     -DAPITRACE_SCRIPTS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${SCRIPTS_INSTALL_DIR}"

diff --git a/gui/main.cpp b/gui/main.cpp
index 3ae56db1768ecc6528446006e2f4c77146fb74c8..471dec7939c7eccd88c4d1c882a121ea2a587b08 100644 (file)
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -3,6 +3,9 @@
 #include "apitrace.h"
 #include "apitracecall.h"
 
+#include "os_string.hpp"
+#include "os_process.hpp"
+
 #include <QApplication>
 #include <QMetaType>
 #include <QVariant>
@@ -34,8 +37,10 @@ int main(int argc, char **argv)
     qRegisterMetaType<QList<QImage> >();
 
 #ifndef Q_OS_WIN
+    os::String currentProcess = os::getProcessName();
+    currentProcess.trimFilename();
     QString path = qgetenv("PATH");
-    path = QLatin1String(APITRACE_BINARY_DIR) + QLatin1String(":") + path;
+    path = QLatin1String(currentProcess.str()) + QLatin1String(":") + path;
     qputenv("PATH", path.toLatin1());
 #endif