summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xCMakeLists.txt9
-rw-r--r--gui/traceprocess.cpp2
2 files changed, 5 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19eb813d..c7f3a449 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 6bdd1c44..ae27e81c 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;