Allow disabling QtZeroConf by qmake option
This commit is contained in:
parent
89bf228406
commit
cb1aaabf5e
8
LICENSES
8
LICENSES
@ -9,8 +9,8 @@ to meet the development and distribution needs of both commercial distributors
|
|||||||
Commercial License
|
Commercial License
|
||||||
|
|
||||||
With the commercial license you can combine and distribute your software with
|
With the commercial license you can combine and distribute your software with
|
||||||
nymea for any commercial purpose. You don’t have to comply with the rules of
|
nymea for any commercial purpose without the implications of the open-sources
|
||||||
the open-source license.
|
on nymea code.
|
||||||
|
|
||||||
Please keep in mind, that nymea is based on the Qt framework and thus requires
|
Please keep in mind, that nymea is based on the Qt framework and thus requires
|
||||||
a valid Qt license.
|
a valid Qt license.
|
||||||
@ -18,6 +18,8 @@ a valid Qt license.
|
|||||||
The nymea commercial license comes with additional tools and services to make
|
The nymea commercial license comes with additional tools and services to make
|
||||||
a developers life easier. You can download the terms and conditions here.
|
a developers life easier. You can download the terms and conditions here.
|
||||||
|
|
||||||
|
Please contact contact@nymea.io for further details.
|
||||||
|
|
||||||
===============================================================================
|
===============================================================================
|
||||||
|
|
||||||
Open-Source License
|
Open-Source License
|
||||||
@ -62,6 +64,8 @@ Files: QtZeroConf/
|
|||||||
The QtZeroConf library is provided by Jonathan Bagg and licensed under the
|
The QtZeroConf library is provided by Jonathan Bagg and licensed under the
|
||||||
terms of the GNU Lesser General Public License, version 3. Please see
|
terms of the GNU Lesser General Public License, version 3. Please see
|
||||||
LICENSE.LGPL3 for more details.
|
LICENSE.LGPL3 for more details.
|
||||||
|
QtZeroConf can be excluded by adding the config option CONFIG-=nozeroconf
|
||||||
|
to qmake.
|
||||||
|
|
||||||
* OpenSSL
|
* OpenSSL
|
||||||
Files: windows_openssl/* and android_openssl/*
|
Files: windows_openssl/* and android_openssl/*
|
||||||
|
|||||||
@ -3,12 +3,15 @@ TEMPLATE = lib
|
|||||||
CONFIG += staticlib
|
CONFIG += staticlib
|
||||||
|
|
||||||
include(../config.pri)
|
include(../config.pri)
|
||||||
!win32: {
|
!win32:!nozeroconf {
|
||||||
# To enable this on Windows we'd need to install Bonjour
|
# To enable this on Windows we'd need to install Bonjour
|
||||||
# https://support.apple.com/kb/DL999
|
# https://support.apple.com/kb/DL999
|
||||||
|
message("Building with QtZeroConf")
|
||||||
DEFINES += QZEROCONF_STATIC
|
DEFINES += QZEROCONF_STATIC
|
||||||
DEFINES += WITH_ZEROCONF
|
DEFINES += WITH_ZEROCONF
|
||||||
include(../QtZeroConf/qtzeroconf.pri)
|
include(../QtZeroConf/qtzeroconf.pri)
|
||||||
|
} else {
|
||||||
|
message("Building without QtZeroConf")
|
||||||
}
|
}
|
||||||
|
|
||||||
include(../nymea-remoteproxy/libnymea-remoteproxyclient/libnymea-remoteproxyclient.pri)
|
include(../nymea-remoteproxy/libnymea-remoteproxyclient/libnymea-remoteproxyclient.pri)
|
||||||
|
|||||||
Reference in New Issue
Block a user