From ce648481b3791fb231192d2406ccecb4dce2779c Mon Sep 17 00:00:00 2001
From: Justin Hammond <Justin@dynam.ac>
Date: Fri, 3 Jan 2020 15:10:43 +0800
Subject: [PATCH] streamline the build a bit

---
 Docker/Dockerfile |  4 ++--
 qt-openzwave.pro  | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index c1b041a..a829d1c 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -14,8 +14,8 @@ WORKDIR /opt
 RUN echo 'APT::Default-Release "stable";' > /etc/apt/apt.conf.d/99defaultrelease && echo 'deb     http://ftp.uk.debian.org/debian/    unstable main contrib non-free' > /etc/apt/sources.list.d/unstable.list && echo 'deb     http://ftp.uk.debian.org/debian/    experimental main contrib non-free' >> /etc/apt/sources.list.d/unstable.list && apt update
 RUN apt-get -y install rapidjson-dev git g++ cmake make pkgconf bash python wget joe mc libunwind-dev libcurl4-openssl-dev && apt-get -y -t unstable install qt5-default && apt-get -y -t unstable install qtbase5-private-dev && apt-get -y -t unstable install g++ && apt-get -y -t experimental install libqt5remoteobjects5-dev libqt5remoteobjects5-bin 
 ENV PATH=$PATH:/opt/depot_tools/
-RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git && mkdir breakpad && cd breakpad && fetch breakpad && cd src && ./configure && make && make install
-RUN git clone https://github.com/qt/qtmqtt.git && cd qtmqtt && git checkout 5.12 && /usr/lib/qt5/bin/qmake && make && make install
+RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git && mkdir breakpad && cd breakpad && fetch breakpad && cd src && ./configure --disable-processor && make && make install
+RUN git clone https://github.com/qt/qtmqtt.git && cd qtmqtt && git checkout 5.12 && /usr/lib/qt5/bin/qmake QT_BUILD_PARTS="libs tools" && make && make install
 RUN git clone https://github.com/OpenZWave/open-zwave.git && cd open-zwave && make -j4 && make install
 RUN git clone https://github.com/OpenZWave/qt-openzwave.git && cd qt-openzwave && git checkout mqtt && /usr/lib/qt5/bin/qmake "CONFIG += BreakPad" && make -j4 && make install
 
diff --git a/qt-openzwave.pro b/qt-openzwave.pro
index 4e2aeb2..8d7a01a 100644
--- a/qt-openzwave.pro
+++ b/qt-openzwave.pro
@@ -10,9 +10,11 @@ CONFIG += ordered silent
 
 SUBDIRS += qt-openzwave \
     qt-openzwavedatabase \
-    qt-ozwdaemon \
-    qt-simpleclient
+    qt-ozwdaemon 
 
-win32 {
-    SUBDIRS -= qt-openzwavedatabase
+Examples {
+	SUBDIRS += qt-simpleclient
+}
+win32 {
+	SUBDIRS -= qt-openzwavedatabase
 }