Put glxtrace.so also in the wrappers directory.

For consistency among all platforms, per Carl Worth's suggestion,
but the wrappers DLLs must remain in a directory of their own to
avoid interfering with other executables.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19eb813df10531841f93856d320d91cea5fdcf8a..c7f3a449249e2377024987a181d0d373369a5b80 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -402,12 +402,11 @@ else ()
     set_target_properties (glxtrace PROPERTIES
         # avoid the default "lib" prefix
         PREFIX ""
-    )
-
-    # Prevent symbol relocations internal to our wrapper library to be
-    # overwritten by the application.
-    set_target_properties (glxtrace PROPERTIES
+        # Prevent symbol relocations internal to our wrapper library to be
+        # overwritten by the application.
         LINK_FLAGS "-Wl,-Bsymbolic -Wl,-Bsymbolic-functions"
+        RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
+        LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
     )
 
     target_link_libraries (glxtrace dl ${X11_X11_LIB})

diff --git a/gui/traceprocess.cpp b/gui/traceprocess.cpp
index 6bdd1c441cbd6558c65b9a8fbceae3222ad3f243..ae27e81c0cd3245cfa9cb3cf2b94bc363555f7ee 100644 (file)
--- a/gui/traceprocess.cpp
+++ b/gui/traceprocess.cpp
@@ -12,7 +12,7 @@ findPreloader()
     QFileInfo fi;
 
 #ifdef APITRACE_BINARY_DIR
-    libPath = QString::fromLatin1(APITRACE_BINARY_DIR "/glxtrace.so");
+    libPath = QString::fromLatin1(APITRACE_BINARY_DIR "/wrappers/glxtrace.so");
     fi = QFileInfo(libPath);
     if (fi.exists())
         return libPath;