From 8167c0f1786f0b5795d76b86e6a2bbb51bc08760 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Thu, 3 Nov 2011 11:54:05 +0000 Subject: [PATCH] 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. --- CMakeLists.txt | 9 ++++----- gui/traceprocess.cpp | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 19eb813..c7f3a44 100755 --- 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 6bdd1c4..ae27e81 100644 --- 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; -- 2.45.2