From 27b78ab88c4d01ef21086be15d64e1af27fcdb29 Mon Sep 17 00:00:00 2001 From: Daniel Thor Kristjansson Date: Fri, 31 May 2013 11:30:33 -0400 Subject: [PATCH] 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. --- .../libs/libmythbase/test/test_mythsystem/test_mythsystem.pro | 3 +++ mythtv/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro | 3 +++ 2 files changed, 6 insertions(+) diff --git a/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro b/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro index 56f1ab13cf1..0843a2a1d5c 100644 --- 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 index 58807c9cddc..ea218a2a9ea 100644 --- 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