GitHub-Mirror/ozw-admin
2
0
Fork 0
mirror of https://github.com/Fishwaldo/ozw-admin.git synced 2025-03-15 19:31:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #30 from bwachter/master

Browse source 
Fix building with system wide qt-openzwave
This commit is contained in:
Justin Hammond 2020-05-23 11:51:09 +08:00 • committed by GitHub
commit c10258c75f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ozw-admin.pri
View file

@ -117,13 +117,13 @@ unix {
INCLUDEPATH+=$$QTOZW_INCLUDE_PATH
LIBS+=$$QTOZW_LIBS
} else {
packagesExist("libqt-openzwave") {
PKGCONFIG += libqt-openzwave
packagesExist("qt-openzwave") {
PKGCONFIG += qt-openzwave
message(" ")
message("QT-OpenZWave Summary:")
message(" Using QT-OpenZWave from pkg-config:")
message(" CXXFLAGS: $$system($$PKG_CONFIG --cflags libqt-openzwave)")
message(" LDFLAGS: $$system($$PKG_CONFIG --libs libqt-openzwave)")
message(" CXXFLAGS: $$system($$PKG_CONFIG --cflags qt-openzwave)")
message(" LDFLAGS: $$system($$PKG_CONFIG --libs qt-openzwave)")
message(" ")
} else {
error("Can't find QT-OpenZWave Library and Headers");

2
ozwadmin-main/ozwadmin-main.pro
View file

@ -66,7 +66,7 @@ include(../ozw-admin.pri)
unix {
target.path = /usr/local/bin
INSTALLS += target
LIBS += -L../devicedb-lib/ -ldevicedb-lib -L../ozwadmin-widgets/ -lozwadmin-widgets
LIBS += -L../devicedb-lib/ -ldevicedb-lib -L../ozwadmin-widgets/ -lozwadmin-widgets -lqt-openzwavedatabase
}
windows {
CONFIG(debug, debug|release) {