restructured project structure: move projects into sub-folders, split dispmanx-grabber from hyperion

src/CMakeLists.txt

@@ -1,27 +1,4 @@
-
-add_executable(WriteConfig
-		WriteConfig.cpp)
-
-add_executable(hyperiond
-		hyperion-d.cpp)
-
-target_link_libraries(hyperiond
-		hyperion
-		jsonserver)
-
-# Find the libPNG
-find_package(PNG QUIET)
-
-if(PNG_FOUND)
-	# Add additional includes dirs
-	include_directories(${PNG_INCLUDE_DIR})
-
-	add_executable(ViewPng
-			ViewPng.cpp)
-
-	target_link_libraries(ViewPng
-			hyperion
-			${PNG_LIBRARIES})
-endif(PNG_FOUND)
-
-add_subdirectory(hyperion-remote)
+add_subdirectory(hyperiond)
+add_subdirectory(hyperion-remote)
+add_subdirectory(viewpng)
+add_subdirectory(writeconfig)

src/hyperiond/CMakeLists.txt

@@ -0,0 +1,8 @@
+
+add_executable(hyperiond
+		hyperiond.cpp)
+
+target_link_libraries(hyperiond
+		hyperion
+		dispmanx-grabber
+		jsonserver)

src/hyperiond/hyperiond.cpp

@@ -6,9 +6,11 @@
 #include <utils/jsonschema/JsonFactory.h>
 
 // Hyperion includes
-#include <hyperion/DispmanxWrapper.h>
 #include <hyperion/Hyperion.h>
 
+// Dispmanx grabber includes
+#include <dispmanx-grabber/DispmanxWrapper.h>
+
 // JsonServer includes
 #include <jsonserver/JsonServer.h>
 

src/viewpng/CMakeLists.txt

@@ -0,0 +1,14 @@
+# Find the libPNG
+find_package(PNG QUIET)
+
+if(PNG_FOUND)
+	# Add additional includes dirs
+	include_directories(${PNG_INCLUDE_DIR})
+
+	add_executable(viewpng
+			ViewPng.cpp)
+
+	target_link_libraries(viewpng
+			hyperion
+			${PNG_LIBRARIES})
+endif(PNG_FOUND)

src/writeconfig/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_executable(WriteConfig
+		WriteConfig.cpp)