mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use QMAKE_RPATHDIR instead of -Wl,-rpath

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-02-18 00:07:37 -08:00
parent 46ce3043a1
commit b33376e561
1 changed files with 2 additions and 2 deletions

4
subsurface-configure.pri
View file

@ -138,7 +138,7 @@ isEmpty(LIBGIT2DEVEL) {
} else { } else {
INCLUDEPATH += $$LIBGIT2DEVEL/include INCLUDEPATH += $$LIBGIT2DEVEL/include
isEmpty(LIBGIT2STATIC) { isEmpty(LIBGIT2STATIC) {
setRpath: LIBS += -Wl,-rpath $$LIBGIT2DEVEL/build setRpath: QMAKE_RPATHDIR += $$LIBGIT2DEVEL/build
LIBS += -L$$LIBGIT2DEVEL/build -lgit2 -lz -lcrypto LIBS += -L$$LIBGIT2DEVEL/build -lgit2 -lz -lcrypto
} else { } else {
LIBS += $$LIBGIT2DEVEL/build/libgit2.a -Wl,-Bstatic -lz -lssl -lcrypto -Wl,-Bdynamic -ldl 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) { !isEmpty(LIBMARBLEDEVEL) {
# find it next to our sources # find it next to our sources
INCLUDEPATH += $$LIBMARBLEDEVEL/include INCLUDEPATH += $$LIBMARBLEDEVEL/include
setRpath: LIBS += -Wl,-rpath $$LIBMARBLEDEVEL/lib setRpath: QMAKE_RPATHDIR += $$LIBMARBLEDEVEL/lib
LIBS += -L$$LIBMARBLEDEVEL/lib LIBS += -L$$LIBMARBLEDEVEL/lib
} }
!contains(DEFINES, NO_MARBLE) { !contains(DEFINES, NO_MARBLE) {