Merge pull request #1 from guh/dont-set-install-path
Don't set install path in project file
This commit is contained in:
commit
8e649b6cd7
10
debian/changelog
vendored
10
debian/changelog
vendored
@ -1,5 +1,11 @@
|
|||||||
nymea-mqtt (0.1.0) UNRELEASED; urgency=medium
|
nymea-mqtt (0.1.1) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
|
* Bugfix release
|
||||||
|
|
||||||
|
-- Michael Zanetti <michael.zanetti@guh.io> Fri, 12 Apr 2019 21:55:35 +0200
|
||||||
|
|
||||||
|
nymea-mqtt (0.1.0) bionic; urgency=medium
|
||||||
|
|
||||||
* Initial release.
|
* Initial release.
|
||||||
|
|
||||||
-- Michael Zanetti <michael.zanetti@guh.io> Tue, 13 Nov 2018 01:04:13 +0100
|
-- Michael Zanetti <michael.zanetti@guh.io> Fri, 12 Apr 2019 21:55:31 +0200
|
||||||
|
|||||||
2
debian/libnymea-mqtt-dev.install.in
vendored
2
debian/libnymea-mqtt-dev.install.in
vendored
@ -1,2 +1,2 @@
|
|||||||
usr/lib/@DEB_HOST_MULTIARCH@/libnymea-mqtt.so
|
usr/lib/libnymea-mqtt.so usr/lib/@DEB_HOST_MULTIARCH@/
|
||||||
usr/include/nymea-mqtt/
|
usr/include/nymea-mqtt/
|
||||||
|
|||||||
6
debian/libnymea-mqtt.install.in
vendored
6
debian/libnymea-mqtt.install.in
vendored
@ -1,3 +1,3 @@
|
|||||||
usr/lib/@DEB_HOST_MULTIARCH@/libnymea-mqtt.so.1
|
usr/lib/libnymea-mqtt.so.1 usr/lib/@DEB_HOST_MULTIARCH@/
|
||||||
usr/lib/@DEB_HOST_MULTIARCH@/libnymea-mqtt.so.1.0
|
usr/lib/libnymea-mqtt.so.1.0 usr/lib/@DEB_HOST_MULTIARCH@/
|
||||||
usr/lib/@DEB_HOST_MULTIARCH@/libnymea-mqtt.so.1.0.0
|
usr/lib/libnymea-mqtt.so.1.0.0 usr/lib/@DEB_HOST_MULTIARCH@/
|
||||||
|
|||||||
@ -1,19 +1,17 @@
|
|||||||
TARGET = nymea-mqtt
|
# Include this file in your project if you want to
|
||||||
|
# statically link to libnymea-mqtt
|
||||||
|
|
||||||
QT -= gui
|
QT -= gui
|
||||||
QT += network
|
QT += network
|
||||||
|
|
||||||
CONFIG += c++11 console static shared
|
CONFIG += c++11 console static
|
||||||
CONFIG -= app_bundle
|
CONFIG -= app_bundle
|
||||||
|
|
||||||
target.path = /usr/lib/$$system('dpkg-architecture -q DEB_HOST_MULTIARCH')
|
|
||||||
INSTALLS += target
|
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
mqttserver.cpp \
|
mqttserver.cpp \
|
||||||
mqttpacket.cpp \
|
mqttpacket.cpp \
|
||||||
mqttsubscription.cpp \
|
mqttsubscription.cpp \
|
||||||
$$PWD/mqttclient.cpp
|
mqttclient.cpp
|
||||||
|
|
||||||
PRIVATE_HEADERS = \
|
PRIVATE_HEADERS = \
|
||||||
mqttpacket_p.h \
|
mqttpacket_p.h \
|
||||||
|
|||||||
@ -3,6 +3,15 @@ TARGET = nymea-mqtt
|
|||||||
|
|
||||||
include(libnymea-mqtt.pri)
|
include(libnymea-mqtt.pri)
|
||||||
|
|
||||||
|
# The .pri is made for other projects to include it in a static manner
|
||||||
|
# Change it to build a shared lib here.
|
||||||
|
CONFIG -= static
|
||||||
|
CONFIG += shared
|
||||||
|
|
||||||
|
# install lib
|
||||||
|
target.path = /usr/lib
|
||||||
|
INSTALLS += target
|
||||||
|
|
||||||
# install headers
|
# install headers
|
||||||
pubheaders.files += $$PUBLIC_HEADERS
|
pubheaders.files += $$PUBLIC_HEADERS
|
||||||
pubheaders.path = /usr/include/nymea-mqtt/
|
pubheaders.path = /usr/include/nymea-mqtt/
|
||||||
|
|||||||
Reference in New Issue
Block a user