Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Simplify rpath configuration settings.
Using a global variable instead, set to the proper value according to the system used to compile
  • Loading branch information
jyavenard committed Jun 9, 2013
1 parent 33d6370 commit 22883be
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 54 deletions.
19 changes: 5 additions & 14 deletions mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro
Expand Up @@ -14,26 +14,17 @@ TARGET = test_mythsystem
DEPENDPATH += . ../.. ../../logging
INCLUDEPATH += . ../.. ../../logging
LIBS += -L../.. -lmythbase-$$LIBVERSION
LIBS += -Wl,-rpath,$${PWD}/../..
LIBS += -Wl,$$_RPATH_$${PWD}/../..

contains(QMAKE_CXX, "g++") {
QMAKE_CXXFLAGS += -O0 -fprofile-arcs -ftest-coverage
QMAKE_LFLAGS += -fprofile-arcs
}

macx {
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/
QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../..
}

linux | freebsd {
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/
QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../..
}
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/
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../..

# Input
HEADERS += test_mythsystem.h
Expand Down
Expand Up @@ -14,26 +14,17 @@ TARGET = test_mythsystemlegacy
DEPENDPATH += . ../.. ../../logging
INCLUDEPATH += . ../.. ../../logging
LIBS += -L../.. -lmythbase-$$LIBVERSION
LIBS += -Wl,-rpath,$${PWD}/../..
LIBS += -Wl,$$_RPATH_$${PWD}/../..

contains(QMAKE_CXX, "g++") {
QMAKE_CXXFLAGS += -O0 -fprofile-arcs -ftest-coverage
QMAKE_LFLAGS += -fprofile-arcs
}

macx {
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/
QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../..
}

linux | freebsd {
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/
QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../..
}
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/
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../..

# Input
HEADERS += test_mythsystemlegacy.h
Expand Down
17 changes: 4 additions & 13 deletions mythtv/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro
Expand Up @@ -17,19 +17,10 @@ contains(QMAKE_CXX, "g++") {
QMAKE_LFLAGS += -fprofile-arcs
}

macx {
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/
QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../..
}

linux | freebsd {
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/
QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../..
}
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/
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../..

# Input
HEADERS += test_mythtimer.h
Expand Down
17 changes: 4 additions & 13 deletions mythtv/libs/libmythbase/test/test_template/test_template.pro
Expand Up @@ -20,19 +20,10 @@ contains(QMAKE_CXX, "g++") {
QMAKE_LFLAGS += -fprofile-arcs
}

macx {
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/
QMAKE_LFLAGS += -Wl,-rpath,$(PWD)/../..
}

linux | freebsd {
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/
QMAKE_LFLAGS += -Wl,-rpath=$(PWD)/../..
}
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/
QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../..

# Input
HEADERS += test_template.h
Expand Down

0 comments on commit 22883be

Please sign in to comment.