Properly link with zmq stuff in tests.

When running the tests we were dynamically linking with the installed versions of these libraries rather than the just compiled versions as we should be. Thanks go to Raymond Wagner for identifying the problem.
MythTV · May 31, 2013 · 27b78ab · 27b78ab
1 parent 6646100
commit 27b78ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro b/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro
@@ -20,6 +20,9 @@ contains(QMAKE_CXX, "g++") {
   QMAKE_CXXFLAGS += -O0 -fprofile-arcs -ftest-coverage 
   QMAKE_LFLAGS += -fprofile-arcs 
 }
+QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/zeromq/src/.libs/
+QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/nzmqt/src/
+QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/qjson/lib/
 
 # Input
 HEADERS += test_mythsystem.h

diff --git a/mythtv/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro b/mythtv/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro
@@ -16,6 +16,9 @@ contains(QMAKE_CXX, "g++") {
   QMAKE_CXXFLAGS += -O0 -fprofile-arcs -ftest-coverage 
   QMAKE_LFLAGS += -fprofile-arcs 
 }
+QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/zeromq/src/.libs/
+QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/nzmqt/src/
+QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../../../../external/qjson/lib/
 
 # Input
 HEADERS += test_mythtimer.h