summaryrefslogtreecommitdiffstats
path: root/subsurface-configure.pri
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-02-18 00:07:37 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-02-18 00:07:37 -0800
commitb33376e561e28dac461f1d8531fa456d355ec4a0 (patch)
tree6c1415db9562152b7c0c6b8ce76901664abbf7be /subsurface-configure.pri
parent46ce3043a1240b976305c49211c495946844c454 (diff)
downloadsubsurface-b33376e561e28dac461f1d8531fa456d355ec4a0.tar.gz
Use QMAKE_RPATHDIR instead of -Wl,-rpath
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-configure.pri')
-rw-r--r--subsurface-configure.pri4
1 files changed, 2 insertions, 2 deletions
diff --git a/subsurface-configure.pri b/subsurface-configure.pri
index cca0a8816..9c0cfdfc5 100644
--- a/subsurface-configure.pri
+++ b/subsurface-configure.pri
@@ -138,7 +138,7 @@ isEmpty(LIBGIT2DEVEL) {
} else {
INCLUDEPATH += $$LIBGIT2DEVEL/include
isEmpty(LIBGIT2STATIC) {
- setRpath: LIBS += -Wl,-rpath $$LIBGIT2DEVEL/build
+ setRpath: QMAKE_RPATHDIR += $$LIBGIT2DEVEL/build
LIBS += -L$$LIBGIT2DEVEL/build -lgit2 -lz -lcrypto
} else {
LIBS += $$LIBGIT2DEVEL/build/libgit2.a -Wl,-Bstatic -lz -lssl -lcrypto -Wl,-Bdynamic -ldl
@@ -157,7 +157,7 @@ contains(QMAKE_PLATFORM, android): DEFINES += NO_MARBLE NO_USERMANUAL NO_PRINTIN
!isEmpty(LIBMARBLEDEVEL) {
# find it next to our sources
INCLUDEPATH += $$LIBMARBLEDEVEL/include
- setRpath: LIBS += -Wl,-rpath $$LIBMARBLEDEVEL/lib
+ setRpath: QMAKE_RPATHDIR += $$LIBMARBLEDEVEL/lib
LIBS += -L$$LIBMARBLEDEVEL/lib
}
!contains(DEFINES, NO_MARBLE) {