mirror of
https://github.com/Fishwaldo/qt-openzwave.git
synced 2025-03-16 03:51:25 +00:00
Fix up some paths
This commit is contained in:
parent
832ec8f36f
commit
debb7ae21b
3 changed files with 38 additions and 16 deletions
|
@ -1,2 +1,31 @@
|
|||
top_srcdir=$$PWD
|
||||
top_builddir=$$shadowed($$PWD)
|
||||
|
||||
unix {
|
||||
isEmpty(OZW_LIB_PATH) {
|
||||
QT_CONFIG -= no-pkg-config
|
||||
CONFIG += link_pkgconfig
|
||||
packagesExist(libopenzwave) {
|
||||
message("Using Distribution copy of OpenZWave")
|
||||
PKGCONFIG += openzwave
|
||||
} else {
|
||||
exists( $$top_srcdir/../open-zwave/cpp/src/) {
|
||||
message("Found Openzwave in $$absolute_path($$top_srcdir/../open-zwave/cpp/src)")
|
||||
OZW_LIB_PATH = $$absolute_path($$top_srcdir/../open-zwave/)
|
||||
INCLUDEPATH += $$absolute_path($$top_srcdir/../open-zwave/cpp/src/)
|
||||
LIBS += -L$$absolute_path($$top_srcdir/../open-zwave/) -lopenzwave
|
||||
} else {
|
||||
error("Can't Find a copy of OpenZwave")
|
||||
}
|
||||
}
|
||||
} else {
|
||||
exists($$OZW_LIB_PATH/cpp/src/) {
|
||||
INCLUDEPATH += $$absolute_path($$OZW_LIB_PATH/cpp/src/)
|
||||
LIBS += -L$$absolute_path($$OZW_LIB_PATH) -lopenzwave
|
||||
message("Using OZW from Path Supplied in OZW_LIB_PATH varible: $$OZW_LIB_PATH" )
|
||||
} else {
|
||||
error("Unable to find a copy of OZW in $$OZW_LIB_PATH")
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -8,9 +8,4 @@ TEMPLATE = subdirs
|
|||
|
||||
CONFIG += ordered silent
|
||||
|
||||
#SUBDIRS = qt-openzwave simpleclient ozwadmin-widgets devicedb-lib ozwadmin-main
|
||||
|
||||
SUBDIRS = qt-openzwave simpleclient
|
||||
|
||||
|
||||
ozwadmin-main.depends = qt-openzwave ozwadmin-widgets devicedb-lib
|
||||
|
|
|
@ -1,19 +1,12 @@
|
|||
QT += widgets remoteobjects websockets
|
||||
include(../qt-openzwave.pri)
|
||||
|
||||
SOURCES = main.cpp \
|
||||
mainwindow.cpp \
|
||||
qtozw_itemdelegate.cpp \
|
||||
startup.cpp
|
||||
QT += widgets remoteobjects
|
||||
|
||||
#CONFIG -= app_bundle
|
||||
#CONFIG += static
|
||||
CONFIG += silent
|
||||
DEFINES += remote
|
||||
|
||||
LIBS += -L../qt-openzwave/ -lqt-openzwave -L../open-zwave/ -lopenzwave -lresolv
|
||||
INCLUDEPATH += ../qt-openzwave ../open-zwave/cpp/src
|
||||
|
||||
requires(qtConfig(treeview))
|
||||
LIBS += -L../qt-openzwave/ -lqt-openzwave -lresolv
|
||||
INCLUDEPATH += ../qt-openzwave
|
||||
|
||||
macx {
|
||||
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
|
||||
|
@ -27,6 +20,11 @@ FORMS += \
|
|||
mainwindow.ui \
|
||||
startup.ui
|
||||
|
||||
SOURCES = main.cpp \
|
||||
mainwindow.cpp \
|
||||
qtozw_itemdelegate.cpp \
|
||||
startup.cpp
|
||||
|
||||
HEADERS += \
|
||||
mainwindow.h \
|
||||
qtozw_itemdelegate.h \
|
||||
|
|
Loading…
Add table
Reference in a new issue