Fix scripts absolute earch path (issue #76).

Wrongly copy'n'pasted from wrappers code.

Probably never actually used, as relative search paths where successful.

Thanks to hramrach for spotting it.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3aaec6e82779d2e6d2b8c9dbbcb3dff5fc808b7b..70ebd872e54bd540fa79e27a73f6d50b2e07135b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,8 +215,8 @@ else ()
     set (LIB_INSTALL_DIR lib/${CMAKE_PROJECT_NAME})
 endif ()
 
-set(SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts)
-set(WRAPPER_INSTALL_DIR ${LIB_INSTALL_DIR}/wrappers)
+set (SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts)
+set (WRAPPER_INSTALL_DIR ${LIB_INSTALL_DIR}/wrappers)
 
 # Expose the binary/install directories to source
 #
@@ -226,7 +226,7 @@ set(WRAPPER_INSTALL_DIR ${LIB_INSTALL_DIR}/wrappers)
 add_definitions(
     -DAPITRACE_BINARY_DIR="${CMAKE_BINARY_DIR}"
     -DAPITRACE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"
-    -DAPITRACE_WRAPPER_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${WRAPPER_INSTALL_DIR}"
+    -DAPITRACE_LIB_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}"
 )
 
 

diff --git a/common/trace_resource.cpp b/common/trace_resource.cpp
index 206e6da157ae4eea74b50930675584265c071341..8b29cfb79373200dd658248303890b668132a62b 100644 (file)
--- a/common/trace_resource.cpp
+++ b/common/trace_resource.cpp
@@ -69,7 +69,7 @@ findScript(const char *scriptFilename)
 
 #ifndef _WIN32
     // Try absolute install directory
-    scriptPath = APITRACE_WRAPPER_INSTALL_DIR;
+    scriptPath = APITRACE_LIB_INSTALL_DIR "/scripts";
     scriptPath.join(scriptFilename);
     if (scriptPath.exists()) {
         return scriptPath;

diff --git a/common/trace_tools_trace.cpp b/common/trace_tools_trace.cpp
index ad355abcbf92b1c327d6e9671b6206410a030768..cad2b0ae153bf7192f7aefb289f0c0d24c8f1a76 100644 (file)
--- a/common/trace_tools_trace.cpp
+++ b/common/trace_tools_trace.cpp
@@ -84,7 +84,7 @@ findWrapper(const char *wrapperFilename)
 
 #ifndef _WIN32
     // Try absolute install directory
-    wrapperPath = APITRACE_WRAPPER_INSTALL_DIR;
+    wrapperPath = APITRACE_LIB_INSTALL_DIR "/wrappers";
     wrapperPath.join(wrapperFilename);
     if (wrapperPath.exists()) {
         return wrapperPath;