From debb7ae21b0af6539a6f9be672629304405f5133 Mon Sep 17 00:00:00 2001 From: Justin Hammond Date: Wed, 22 May 2019 17:28:38 +0800 Subject: [PATCH] Fix up some paths --- qt-openzwave.pri | 29 +++++++++++++++++++++++++++++ qt-openzwave.pro | 5 ----- simpleclient/simpleclient.pro | 20 +++++++++----------- 3 files changed, 38 insertions(+), 16 deletions(-) diff --git a/qt-openzwave.pri b/qt-openzwave.pri index b303d71..bc74341 100644 --- a/qt-openzwave.pri +++ b/qt-openzwave.pri @@ -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") + } + } + +} diff --git a/qt-openzwave.pro b/qt-openzwave.pro index cbaa381..8ccb45f 100644 --- a/qt-openzwave.pro +++ b/qt-openzwave.pro @@ -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 diff --git a/simpleclient/simpleclient.pro b/simpleclient/simpleclient.pro index e3458f4..05eb53d 100644 --- a/simpleclient/simpleclient.pro +++ b/simpleclient/simpleclient.pro @@ -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 \