rpath improvements
Improve on the previous commit adding QMAKE_RPATHDIR. We can now use rpath for out-of-source builds, as well as on osx.
This commit is contained in:
parent
1eea37cb6f
commit
9887fa2333
|
|
@ -11,5 +11,4 @@ script:
|
||||||
- cd build
|
- cd build
|
||||||
- qmake ..
|
- qmake ..
|
||||||
- make
|
- make
|
||||||
- export LD_LIBRARY_PATH=$PWD/src
|
|
||||||
- make check
|
- make check
|
||||||
|
|
@ -9,6 +9,7 @@ DEFINES += QAMQP_BUILD
|
||||||
CONFIG += $${QAMQP_LIBRARY_TYPE}
|
CONFIG += $${QAMQP_LIBRARY_TYPE}
|
||||||
VERSION = $${QAMQP_VERSION}
|
VERSION = $${QAMQP_VERSION}
|
||||||
win32:DESTDIR = $$OUT_PWD
|
win32:DESTDIR = $$OUT_PWD
|
||||||
|
macx:QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
|
||||||
|
|
||||||
PRIVATE_HEADERS += \
|
PRIVATE_HEADERS += \
|
||||||
qamqpchannel_p.h \
|
qamqpchannel_p.h \
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,11 @@
|
||||||
INCLUDEPATH += $${QAMQP_INCLUDEPATH} $${PWD}/common
|
INCLUDEPATH += $${QAMQP_INCLUDEPATH} $${PWD}/common
|
||||||
LIBS += -L$${DEPTH}/src $${QAMQP_LIBS}
|
LIBS += -L$${DEPTH}/src $${QAMQP_LIBS}
|
||||||
|
|
||||||
QMAKE_RPATHDIR += $${DEPTH}/src
|
unix:!macx:QMAKE_RPATHDIR += $${OUT_PWD}/$${DEPTH}/src
|
||||||
|
macx {
|
||||||
|
QMAKE_RPATHDIR += @loader_path/$${DEPTH}/src
|
||||||
|
QMAKE_LFLAGS += -Wl,-rpath,@loader_path/$${DEPTH}/src
|
||||||
|
}
|
||||||
|
|
||||||
QT = core network testlib
|
QT = core network testlib
|
||||||
QT -= gui
|
QT -= gui
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue