From 49e867f5fc9ad6ab9eb879127924fecd08379df9 Mon Sep 17 00:00:00 2001
From: redpanther <redpanther@spooky-online.de>
Date: Thu, 10 Mar 2016 06:53:21 +0100
Subject: [PATCH 1/6] add an auto generated version id

Former-commit-id: df3ad6b08e24e73d957611e8be45e7e8cc717b8c
---
 CMakeLists.txt              | 37 +++++++++++++++++++++----------------
 HyperionConfig.h.in         |  1 +
 cmake/FindGitVersion.cmake  |  9 +++++++++
 src/hyperiond/hyperiond.cpp |  2 +-
 4 files changed, 32 insertions(+), 17 deletions(-)
 create mode 100644 cmake/FindGitVersion.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c8e077a..7b52f7c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,25 +56,30 @@ if(ENABLE_OSX AND ENABLE_DISPMANX)
 	message(FATAL_ERROR "dispmanx grabber and osx grabber cannot be used at the same time")
 endif(ENABLE_OSX AND ENABLE_DISPMANX)
 
+
+
 #if(ENABLE_QT5)
 # TODO vs ENABLE_QT4?
 #endif(ENABLE_QT5)
 
 # Createt the configuration file
+
+# Add project specific cmake modules (find, etc)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+find_package(GitVersion)
+
 # configure a header file to pass some of the CMake settings
 # to the source code
 configure_file("${PROJECT_SOURCE_DIR}/HyperionConfig.h.in" "${PROJECT_BINARY_DIR}/HyperionConfig.h")
 include_directories("${PROJECT_BINARY_DIR}")
 
-# Add project specific cmake modules (find, etc)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-
 if(ENABLE_QT5)
-ADD_DEFINITIONS ( -DENABLE_QT5 )
-#find_package(Qt5Widgets)
+	ADD_DEFINITIONS ( -DENABLE_QT5 )
+	#find_package(Qt5Widgets)
 else(ENABLE_QT5)
-# Add specific cmake modules to find qt4 (default version finds first available QT which might not be qt4)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/qt4)
+	# Add specific cmake modules to find qt4 (default version finds first available QT which might not be qt4)
+	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/qt4)
 endif(ENABLE_QT5)
 
 # Define the global output path of binaries
@@ -97,23 +102,23 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall")
 
 if(ENABLE_QT5)
 #find_package(Qt5Core REQUIRED)
-find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}    ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-#      set(CMAKE_CXX_FLAGS "-fPIC")
+	find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}    ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+#	set(CMAKE_CXX_FLAGS "-fPIC")
 else(ENABLE_QT5)
-# Configure the use of QT4
-find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED QUIET)
+	# Configure the use of QT4
+	find_package(Qt4 COMPONENTS QtCore QtNetwork QtGui REQUIRED QUIET)
 endif(ENABLE_QT5)
 
 #add libusb and pthreads
 find_package(libusb-1.0 REQUIRED)
 find_package(Threads REQUIRED)
 if(ENABLE_QT5)
-#include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
+	#include(${QT_USE_FILE})
+	add_definitions(${QT_DEFINITIONS})
 else(ENABLE_QT5)
-include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
+	include(${QT_USE_FILE})
+	add_definitions(${QT_DEFINITIONS})
 endif(ENABLE_QT5)
 
 # TODO[TvdZ]: This linking directory should only be added if we are cross compiling
diff --git a/HyperionConfig.h.in b/HyperionConfig.h.in
index f5bd3ce1..f41b8078 100644
--- a/HyperionConfig.h.in
+++ b/HyperionConfig.h.in
@@ -27,3 +27,4 @@
 // Define to enable the osx grabber
 #cmakedefine ENABLE_OSX
 
+#define HYPERION_VERSION_ID "${HYPERION_VERSION_ID}"
\ No newline at end of file
diff --git a/cmake/FindGitVersion.cmake b/cmake/FindGitVersion.cmake
new file mode 100644
index 00000000..3ce5fe93
--- /dev/null
+++ b/cmake/FindGitVersion.cmake
@@ -0,0 +1,9 @@
+
+execute_process( COMMAND git log -1 --format=%cn-%t/%h-%ct WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE BUILD_ID ERROR_QUIET )
+execute_process( COMMAND sh -c "git branch | grep '^*' | sed 's;^*;;g' " WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE VERSION_ID ERROR_QUIET )
+
+STRING ( STRIP "${BUILD_ID}" BUILD_ID )
+STRING ( STRIP "${VERSION_ID}" VERSION_ID )
+SET ( HYPERION_VERSION_ID "${VERSION_ID} (${BUILD_ID}" )
+message ( STATUS "Current Version: ${HYPERION_VERSION_ID})" )
+
diff --git a/src/hyperiond/hyperiond.cpp b/src/hyperiond/hyperiond.cpp
index 8af26879..be85a4b5 100644
--- a/src/hyperiond/hyperiond.cpp
+++ b/src/hyperiond/hyperiond.cpp
@@ -96,7 +96,7 @@ int main(int argc, char** argv)
 
 	// Initialising QCoreApplication
 	QCoreApplication app(argc, argv);
-	std::cout << "QCoreApplication initialised" << std::endl;
+	std::cout << "Hyperion initialised, Version: " << HYPERION_VERSION_ID << std::endl;
 
 	signal(SIGINT,  signal_handler);
 	signal(SIGTERM, signal_handler);

From 153d1f0999030e7a1eaefcf5a8c4c7d8702086bd Mon Sep 17 00:00:00 2001
From: redpanther <redpanther@spooky-online.de>
Date: Thu, 10 Mar 2016 12:01:10 +0100
Subject: [PATCH 2/6] print version for every standalone grabber and hyperiond

Former-commit-id: 736894a87ba3d056a8e4f1def236ae4670f16407
---
 src/hyperion-aml/hyperion-aml.cpp           | 8 ++++++++
 src/hyperion-dispmanx/hyperion-dispmanx.cpp | 7 +++++++
 src/hyperion-remote/hyperion-remote.cpp     | 8 ++++++++
 src/hyperion-v4l2/hyperion-v4l2.cpp         | 7 +++++++
 src/hyperion-x11/hyperion-x11.cpp           | 6 ++++++
 src/hyperiond/hyperiond.cpp                 | 6 ++++--
 6 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/hyperion-aml/hyperion-aml.cpp b/src/hyperion-aml/hyperion-aml.cpp
index cca5e688..b8ab1ff6 100644
--- a/src/hyperion-aml/hyperion-aml.cpp
+++ b/src/hyperion-aml/hyperion-aml.cpp
@@ -10,6 +10,9 @@
 #include <protoserver/ProtoConnectionWrapper.h>
 #include "AmlogicWrapper.h"
 
+#include "HyperionConfig.h"
+
+
 using namespace vlofgren;
 
 // save the image as screenshot
@@ -22,6 +25,11 @@ void saveScreenshot(const char * filename, const Image<ColorRgb> & image)
 
 int main(int argc, char ** argv)
 {
+	std::cout
+		<< "hyperion-aml:" << std::endl
+		<< "\tversion   : " << HYPERION_VERSION_ID << std::endl
+		<< "\tbuild time: " << __DATE__ << " " << __TIME__ << std::endl;
+
 	QCoreApplication app(argc, argv);
 
 	try
diff --git a/src/hyperion-dispmanx/hyperion-dispmanx.cpp b/src/hyperion-dispmanx/hyperion-dispmanx.cpp
index abf78c8c..ed86f1dd 100644
--- a/src/hyperion-dispmanx/hyperion-dispmanx.cpp
+++ b/src/hyperion-dispmanx/hyperion-dispmanx.cpp
@@ -9,6 +9,8 @@
 #include <protoserver/ProtoConnectionWrapper.h>
 #include "DispmanxWrapper.h"
 
+#include "HyperionConfig.h"
+
 using namespace vlofgren;
 
 // save the image as screenshot
@@ -21,6 +23,11 @@ void saveScreenshot(const char * filename, const Image<ColorRgb> & image)
 
 int main(int argc, char ** argv)
 {
+	std::cout
+		<< "hyperion-dispmanx:" << std::endl
+		<< "\tversion   : " << HYPERION_VERSION_ID << std::endl
+		<< "\tbuild time: " << __DATE__ << " " << __TIME__ << std::endl;
+
 	QCoreApplication app(argc, argv);
 
 	try
diff --git a/src/hyperion-remote/hyperion-remote.cpp b/src/hyperion-remote/hyperion-remote.cpp
index 3636721f..42df87e9 100644
--- a/src/hyperion-remote/hyperion-remote.cpp
+++ b/src/hyperion-remote/hyperion-remote.cpp
@@ -13,6 +13,9 @@
 #include "CustomParameter.h"
 #include "JsonConnection.h"
 
+#include "HyperionConfig.h"
+
+
 using namespace vlofgren;
 
 /// Count the number of true values in a list of booleans
@@ -28,6 +31,11 @@ int count(std::initializer_list<bool> values)
 
 int main(int argc, char * argv[])
 {
+	std::cout
+		<< "hyperion-remote:" << std::endl
+		<< "\tversion   : " << HYPERION_VERSION_ID << std::endl
+		<< "\tbuild time: " << __DATE__ << " " << __TIME__ << std::endl;
+
 	QCoreApplication app(argc, argv);
 
 	// force the locale
diff --git a/src/hyperion-v4l2/hyperion-v4l2.cpp b/src/hyperion-v4l2/hyperion-v4l2.cpp
index fe011f6d..2bb94018 100644
--- a/src/hyperion-v4l2/hyperion-v4l2.cpp
+++ b/src/hyperion-v4l2/hyperion-v4l2.cpp
@@ -24,6 +24,8 @@
 #include "PixelFormatParameter.h"
 #include "ScreenshotHandler.h"
 
+#include "HyperionConfig.h"
+
 using namespace vlofgren;
 
 // save the image as screenshot
@@ -36,6 +38,11 @@ void saveScreenshot(void *, const Image<ColorRgb> & image)
 
 int main(int argc, char** argv)
 {
+  std::cout
+    << "hyperion-v4l2:" << std::endl
+    << "\tversion   : " << HYPERION_VERSION_ID << std::endl
+    << "\tbuild time: " << __DATE__ << " " << __TIME__ << std::endl;
+
     QCoreApplication app(argc, argv);
 
     // force the locale
diff --git a/src/hyperion-x11/hyperion-x11.cpp b/src/hyperion-x11/hyperion-x11.cpp
index 7815aa34..31d5ab55 100644
--- a/src/hyperion-x11/hyperion-x11.cpp
+++ b/src/hyperion-x11/hyperion-x11.cpp
@@ -8,6 +8,7 @@
 
 #include "protoserver/ProtoConnectionWrapper.h"
 #include "X11Wrapper.h"
+#include "HyperionConfig.h"
 
 using namespace vlofgren;
 
@@ -21,6 +22,11 @@ void saveScreenshot(const char * filename, const Image<ColorRgb> & image)
 
 int main(int argc, char ** argv)
 {
+  std::cout
+    << "hyperion-x11:" << std::endl
+    << "\tversion   : " << HYPERION_VERSION_ID << std::endl
+    << "\tbuild time: " << __DATE__ << " " << __TIME__ << std::endl;
+
     QCoreApplication app(argc, argv);
 
     try
diff --git a/src/hyperiond/hyperiond.cpp b/src/hyperiond/hyperiond.cpp
index be85a4b5..bc962464 100644
--- a/src/hyperiond/hyperiond.cpp
+++ b/src/hyperiond/hyperiond.cpp
@@ -92,11 +92,13 @@ Json::Value loadConfig(const std::string & configFile)
 
 int main(int argc, char** argv)
 {
-	std::cout << "Application build time: " << __DATE__ << " " << __TIME__ << std::endl;
+	std::cout
+		<< "Hyperiond:" << std::endl
+		<< "\tversion   : " << HYPERION_VERSION_ID << std::endl
+		<< "\tbuild time: " << __DATE__ << " " << __TIME__ << std::endl;
 
 	// Initialising QCoreApplication
 	QCoreApplication app(argc, argv);
-	std::cout << "Hyperion initialised, Version: " << HYPERION_VERSION_ID << std::endl;
 
 	signal(SIGINT,  signal_handler);
 	signal(SIGTERM, signal_handler);

From 12b406dd4bede99af8301be8dd17fd9f8685ae75 Mon Sep 17 00:00:00 2001
From: redpanther <redpanther@spooky-online.de>
Date: Thu, 10 Mar 2016 12:06:03 +0100
Subject: [PATCH 3/6] make compile of tests optional and disabled by default

Former-commit-id: dc05b637391ec5b7e79d66d94724828e8dbd2653
---
 CMakeLists.txt | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b52f7c2..04f54483 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,9 @@ message(STATUS "ENABLE_X11 = " ${ENABLE_X11})
 option(ENABLE_QT5 "Enable QT5" OFF)
 message(STATUS "ENABLE_QT5 = " ${ENABLE_QT5})
 
+option(ENABLE_TESTS "Compile additional test applications" OFF)
+message(STATUS "ENABLE_TESTS = " ${ENABLE_TESTS})
+
 if(ENABLE_V4L2 AND NOT ENABLE_PROTOBUF)
 	message(FATAL_ERROR "V4L2 grabber requires PROTOBUF. Disable V4L2 or enable PROTOBUF")
 endif(ENABLE_V4L2 AND NOT ENABLE_PROTOBUF)
@@ -57,7 +60,6 @@ if(ENABLE_OSX AND ENABLE_DISPMANX)
 endif(ENABLE_OSX AND ENABLE_DISPMANX)
 
 
-
 #if(ENABLE_QT5)
 # TODO vs ENABLE_QT4?
 #endif(ENABLE_QT5)
@@ -138,7 +140,10 @@ configure_file(config/hyperion_x86.config.json ${LIBRARY_OUTPUT_PATH} @ONLY)
 add_subdirectory(dependencies)
 add_subdirectory(libsrc)
 add_subdirectory(src)
-add_subdirectory(test)
+if (ENABLE_TESTS)
+	add_subdirectory(test)
+endif (ENABLE_TESTS)
+
 
 # Add the doxygen generation directory
 add_subdirectory(doc)

From e01bcd708dd220c2b0d08398c59b8c51f74f2959 Mon Sep 17 00:00:00 2001
From: redpanther <redpanther@spooky-online.de>
Date: Thu, 10 Mar 2016 12:22:44 +0100
Subject: [PATCH 4/6] add install commands instead of "make" use "make
 install/strip" release compile

Former-commit-id: f4dd2d9e1a4d815b667665892a3bd9cec64218a3
---
 CMakeLists.txt                       |  3 +
 src/hyperion-aml/CMakeLists.txt      |  9 ++-
 src/hyperion-dispmanx/CMakeLists.txt |  3 +
 src/hyperion-remote/CMakeLists.txt   | 84 ++++++++++++++--------------
 src/hyperion-v4l2/CMakeLists.txt     |  3 +
 src/hyperion-x11/CMakeLists.txt      |  2 +
 src/hyperiond/CMakeLists.txt         |  2 +
 7 files changed, 62 insertions(+), 44 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04f54483..d8237edd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,6 +60,9 @@ if(ENABLE_OSX AND ENABLE_DISPMANX)
 endif(ENABLE_OSX AND ENABLE_DISPMANX)
 
 
+SET ( PROTOBUF_INSTALL_BIN_DIR ${CMAKE_SOURCE_DIR}/deploy )
+SET ( PROTOBUF_INSTALL_LIB_DIR ${CMAKE_SOURCE_DIR}/deploy )
+
 #if(ENABLE_QT5)
 # TODO vs ENABLE_QT4?
 #endif(ENABLE_QT5)
diff --git a/src/hyperion-aml/CMakeLists.txt b/src/hyperion-aml/CMakeLists.txt
index cd27c046..e7e7bdff 100644
--- a/src/hyperion-aml/CMakeLists.txt
+++ b/src/hyperion-aml/CMakeLists.txt
@@ -31,13 +31,13 @@ else(ENABLE_QT5)
 	QT4_WRAP_CPP(Hyperion_AML_HEADERS_MOC ${Hyperion_AML_QT_HEADERS})
 endif(ENABLE_QT5)
 
-add_executable(hyperion-amlogic
+add_executable(${PROJECT_NAME}
 	${Hyperion_AML_HEADERS}
 	${Hyperion_AML_SOURCES}
 	${Hyperion_AML_HEADERS_MOC}
 )
 
-target_link_libraries(hyperion-amlogic
+target_link_libraries(${PROJECT_NAME}
 	getoptPlusPlus
 	blackborder
 	hyperion-utils
@@ -46,7 +46,10 @@ target_link_libraries(hyperion-amlogic
 	pthread
 )
 
-qt4_use_modules(hyperion-amlogic
+qt4_use_modules(${PROJECT_NAME}
 	Core
 	Gui
 	Network)
+
+install ( TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_SOURCE_DIR}/deploy/bin" )
+
diff --git a/src/hyperion-dispmanx/CMakeLists.txt b/src/hyperion-dispmanx/CMakeLists.txt
index 130cb661..3263589f 100644
--- a/src/hyperion-dispmanx/CMakeLists.txt
+++ b/src/hyperion-dispmanx/CMakeLists.txt
@@ -63,3 +63,6 @@ else(ENABLE_QT5)
 		Network
 	)
 endif(ENABLE_QT5)
+
+
+install ( TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_SOURCE_DIR}/deploy/bin" )
diff --git a/src/hyperion-remote/CMakeLists.txt b/src/hyperion-remote/CMakeLists.txt
index b8c73a59..c2bfdcff 100644
--- a/src/hyperion-remote/CMakeLists.txt
+++ b/src/hyperion-remote/CMakeLists.txt
@@ -1,41 +1,43 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(hyperion-remote)
-
-# find Qt4
-if(ENABLE_QT5)
-find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED)
-#  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}    ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-#      set(CMAKE_CXX_FLAGS "-fPIC")
-else(ENABLE_QT5)
-find_package(Qt4 REQUIRED QtCore QtGui QtNetwork)
-endif(ENABLE_QT5)
-
-# The following I do not undrstand completely...
-# libQtCore.so uses some hardcoded library path inside which are incorrect after copying the file RPi file system
-# Therefor, an extra path is needed on which to find the required libraries
-LINK_DIRECTORIES(${LINK_DIRECTORIES} ${CMAKE_FIND_ROOT_PATH}/lib/arm-linux-gnueabihf)
-
-include_directories(${QT_INCLUDES})
-
-set(hyperion-remote_HEADERS
-	CustomParameter.h
-	JsonConnection.h
-	ColorTransformValues.h)
-
-set(hyperion-remote_SOURCES
-	hyperion-remote.cpp
-	JsonConnection.cpp)
-
-add_executable(hyperion-remote
-	${hyperion-remote_HEADERS}
-	${hyperion-remote_SOURCES})
-
-if(ENABLE_QT5)
-qt5_use_modules(hyperion-remote Widgets Network)
-endif(ENABLE_QT5)
-
-target_link_libraries(hyperion-remote
-	jsoncpp
-    getoptPlusPlus
-    ${QT_LIBRARIES})
+cmake_minimum_required(VERSION 2.8)
+
+project(hyperion-remote)
+
+# find Qt4
+if(ENABLE_QT5)
+find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED)
+#  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}    ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+#      set(CMAKE_CXX_FLAGS "-fPIC")
+else(ENABLE_QT5)
+find_package(Qt4 REQUIRED QtCore QtGui QtNetwork)
+endif(ENABLE_QT5)
+
+# The following I do not undrstand completely...
+# libQtCore.so uses some hardcoded library path inside which are incorrect after copying the file RPi file system
+# Therefor, an extra path is needed on which to find the required libraries
+LINK_DIRECTORIES(${LINK_DIRECTORIES} ${CMAKE_FIND_ROOT_PATH}/lib/arm-linux-gnueabihf)
+
+include_directories(${QT_INCLUDES})
+
+set(hyperion-remote_HEADERS
+	CustomParameter.h
+	JsonConnection.h
+	ColorTransformValues.h)
+
+set(hyperion-remote_SOURCES
+	hyperion-remote.cpp
+	JsonConnection.cpp)
+
+add_executable(hyperion-remote
+	${hyperion-remote_HEADERS}
+	${hyperion-remote_SOURCES})
+
+if(ENABLE_QT5)
+qt5_use_modules(hyperion-remote Widgets Network)
+endif(ENABLE_QT5)
+
+target_link_libraries(hyperion-remote
+	jsoncpp
+    getoptPlusPlus
+    ${QT_LIBRARIES})
+
+install ( TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_SOURCE_DIR}/deploy/bin" )
diff --git a/src/hyperion-v4l2/CMakeLists.txt b/src/hyperion-v4l2/CMakeLists.txt
index ef051e2d..173e7fd2 100644
--- a/src/hyperion-v4l2/CMakeLists.txt
+++ b/src/hyperion-v4l2/CMakeLists.txt
@@ -53,3 +53,6 @@ target_link_libraries(hyperion-v4l2
 	pthread
 	${QT_LIBRARIES}
 )
+
+install ( TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_SOURCE_DIR}/deploy/bin" )
+
diff --git a/src/hyperion-x11/CMakeLists.txt b/src/hyperion-x11/CMakeLists.txt
index 626781f9..a6f9c513 100644
--- a/src/hyperion-x11/CMakeLists.txt
+++ b/src/hyperion-x11/CMakeLists.txt
@@ -62,3 +62,5 @@ qt4_use_modules(hyperion-x11
 	Gui
 	Network)
 endif(ENABLE_QT5)
+
+install ( TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_SOURCE_DIR}/deploy/bin" )
diff --git a/src/hyperiond/CMakeLists.txt b/src/hyperiond/CMakeLists.txt
index 70c2381b..5aef74d2 100644
--- a/src/hyperiond/CMakeLists.txt
+++ b/src/hyperiond/CMakeLists.txt
@@ -33,3 +33,5 @@ endif (ENABLE_AMLOGIC)
 if (ENABLE_PROTOBUF)
 	target_link_libraries(hyperiond protoserver)
 endif (ENABLE_PROTOBUF)
+
+install ( TARGETS hyperiond DESTINATION "${CMAKE_SOURCE_DIR}/deploy/bin" )

From e84841178549a6999cdc2e3ebefa8a4bc454e210 Mon Sep 17 00:00:00 2001
From: redpanther <redpanther@spooky-online.de>
Date: Thu, 10 Mar 2016 17:11:02 +0100
Subject: [PATCH 5/6] install proto to binary dir

Former-commit-id: aaac3a7094442b0bfc51a572fcfa6f7cc59b81a2
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8237edd..a47771a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,8 +60,8 @@ if(ENABLE_OSX AND ENABLE_DISPMANX)
 endif(ENABLE_OSX AND ENABLE_DISPMANX)
 
 
-SET ( PROTOBUF_INSTALL_BIN_DIR ${CMAKE_SOURCE_DIR}/deploy )
-SET ( PROTOBUF_INSTALL_LIB_DIR ${CMAKE_SOURCE_DIR}/deploy )
+SET ( PROTOBUF_INSTALL_BIN_DIR ${CMAKE_BINARY_DIR}/proto )
+SET ( PROTOBUF_INSTALL_LIB_DIR ${CMAKE_BINARY_DIR}/proto )
 
 #if(ENABLE_QT5)
 # TODO vs ENABLE_QT4?

From fd2cb44b1c2ebec31810511c0aa8e4a31e232c12 Mon Sep 17 00:00:00 2001
From: redpanther <redpanther@spooky-online.de>
Date: Sun, 13 Mar 2016 08:07:58 +0100
Subject: [PATCH 6/6] merge upstream

Former-commit-id: 041b6fab005766e1e5be56db2ce264c060504e47
---
 src/hyperion-remote/CMakeLists.txt | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/hyperion-remote/CMakeLists.txt b/src/hyperion-remote/CMakeLists.txt
index aef98214..36ca8cc2 100644
--- a/src/hyperion-remote/CMakeLists.txt
+++ b/src/hyperion-remote/CMakeLists.txt
@@ -2,15 +2,6 @@ cmake_minimum_required(VERSION 2.8)
 
 project(hyperion-remote)
 
-<<<<<<< HEAD
-# find Qt4
-if(ENABLE_QT5)
-find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED)
-#  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}    ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-#      set(CMAKE_CXX_FLAGS "-fPIC")
-else(ENABLE_QT5)
-find_package(Qt4 REQUIRED QtCore QtGui QtNetwork)
-=======
 # find Qt
 if(ENABLE_QT5)
 	find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED)
@@ -18,7 +9,6 @@ if(ENABLE_QT5)
 #	set(CMAKE_CXX_FLAGS "-fPIC")
 else(ENABLE_QT5)
 	find_package(Qt4 REQUIRED QtCore QtGui QtNetwork)
->>>>>>> upstream/master/master
 endif(ENABLE_QT5)
 
 # The following I do not undrstand completely...