From 12b73912f2c80ddbc690bd44cc44b8ce09488511 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 17 Feb 2015 21:46:05 -0800 Subject: Use rpath to make binaries run without LD_LIBRARY_PATH When building binaries with our custom libraries it is always a pain to ensure that all the libraries are found. Adding an rpath can help. When running qmake with CONFIG+=setRpath we include the paths for our private builds of libgit2 and libssrfmarble (assuming those are not using the system libraries). Signed-off-by: Dirk Hohndel --- subsurface-configure.pri | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'subsurface-configure.pri') diff --git a/subsurface-configure.pri b/subsurface-configure.pri index d2092d3ac..3cba31279 100644 --- a/subsurface-configure.pri +++ b/subsurface-configure.pri @@ -138,6 +138,7 @@ isEmpty(LIBGIT2DEVEL) { } else { INCLUDEPATH += $$LIBGIT2DEVEL/include isEmpty(LIBGIT2STATIC) { + setRpath: LIBS += -rpath $$LIBGIT2DEVEL/build LIBS += -L$$LIBGIT2DEVEL/build -lgit2 -lz -lcrypto } else { LIBS += $$LIBGIT2DEVEL/build/libgit2.a -Wl,-Bstatic -lz -lssl -lcrypto -Wl,-Bdynamic -ldl @@ -156,12 +157,13 @@ contains(QMAKE_PLATFORM, android): DEFINES += NO_MARBLE NO_USERMANUAL NO_PRINTIN !isEmpty(LIBMARBLEDEVEL) { # find it next to our sources INCLUDEPATH += $$LIBMARBLEDEVEL/include + setRpath: LIBS += -rpath $$LIBMARBLEDEVEL/lib LIBS += -L$$LIBMARBLEDEVEL/lib } !contains(DEFINES, NO_MARBLE) { win32: CONFIG(debug, debug|release): LIBS += -lmarblewidgetd else: !isEmpty(SPECIAL_MARBLE_PREFIX) { - LIBS += -L$$LIBMARBLEDEVEL/src/lib/marble -lssrfmarblewidget + LIBS += -lssrfmarblewidget } else { LIBS += -lmarblewidget } -- cgit v1.2.3-70-g09d2