ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #516: Add rpath to nymead binary

Browse Source
This commit is contained in:
jenkins 2022-05-03 23:27:14 +02:00
commit c71d66ccdb
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/rules vendored
View File

@ -16,7 +16,7 @@ ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
MAKE_TARGETS += doc MAKE_TARGETS += doc
endif endif
QMAKE_ADDITIONAL_ARGS= QMAKE_ADDITIONAL_ARGS = CONFIG+=norpath
ifneq (,$(filter coverage,$(DEB_BUILD_OPTIONS))) ifneq (,$(filter coverage,$(DEB_BUILD_OPTIONS)))
QMAKE_ADDITIONAL_ARGS += CONFIG+=coverage CONFIG+=debug QMAKE_ADDITIONAL_ARGS += CONFIG+=coverage CONFIG+=debug
else else

6
server/server.pro
View File

@ -17,6 +17,12 @@ LIBS += -L$$top_builddir/libnymea/ -lnymea \
-L$$top_builddir/libnymea-core -lnymea-core \ -L$$top_builddir/libnymea-core -lnymea-core \
-lnymea-remoteproxyclient -lnymea-remoteproxyclient
# Add rpath for easy running from the build dir, unless explicitly disabled
!norpath: {
message("Adding rpath to nymead binary")
LIBS += -Wl,-rpath ../libnymea/:../libnymea-core/
}
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
PKGCONFIG += nymea-zigbee PKGCONFIG += nymea-zigbee