Fix compilation of sprinklerd

src/prog/chacond/builders/cmake/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.0)
 
-project(chacond)
+project (chacond)
 
 set (CMAKE_MODULE_PATH "${MODULE_PATH}")
 

src/prog/sprinklerd/builders/cmake/CMakeLists.txt

@@ -0,0 +1,35 @@
+cmake_minimum_required (VERSION 3.0)
+
+project (sprinklerd)
+
+set (CMAKE_MODULE_PATH "${MODULE_PATH}")
+set (CMAKE_CXX_STANDARD 11)
+
+include (br)
+
+include_directories ($ENV{SRC_DIR}/src/prog/sprinklerd)
+
+set(CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Werror=strict-aliasing")
+
+file(
+	GLOB_RECURSE
+	source_files
+
+	$ENV{SRC_DIR}/src/prog/sprinklerd/src/main.cpp
+	$ENV{SRC_DIR}/src/prog/sprinklerd/src/ubus-sprinkler-model.cpp
+	$ENV{SRC_DIR}/src/prog/sprinklerd/src/sprinklers.cpp
+)
+
+add_executable (sprinklerd ${source_files})
+
+target_link_libraries (sprinklerd 
+	LINK_PUBLIC
+	ubus-cpp	
+	jsoncpp
+	ubox
+	ubus
+	blobmsg_json
+	rt
+)
+
+install (TARGETS sprinklerd DESTINATION local/bin)

src/prog/sprinklerd/src/main.cpp

@@ -32,7 +32,7 @@ extern "C" {
 #include <libubus.h>
 }
 
-#include "UbusSprinklerModel.h"
+#include "ubus-sprinkler-model.h"
 
 #include "sprinklers.h"
 

src/prog/sprinklerd/src/sprinklers.cpp

@@ -29,10 +29,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <jsoncpp/json.h>
+#include <json/json.h>
 #include <string>
 
-#include <ubuscpp/UBusCall.h>
+#include <ubus-cpp/UBusCall.h>
 
 #include "sprinklers.h"
 

src/prog/sprinklerd/src/ubus-sprinkler-model.cpp

@@ -30,7 +30,7 @@
 #include <string>
 #include <sstream> 
 
-#include <jsoncpp/json.h>
+#include <json/json.h>
 
 extern "C" {
 #include <libubox/blobmsg_json.h>
@@ -38,7 +38,7 @@ extern "C" {
 
 #include "sprinklers.h"
 
-#include "UbusSprinklerModel.h"
+#include "ubus-sprinkler-model.h"
 
 namespace { 
 
@@ -69,8 +69,7 @@ SprinkerModel::SprinkerModel (void) :
  *  @brief Destructor of the UBus Mixer Volume.
  */
 SprinkerModel::~SprinkerModel (void)
-{
-	
+{	
 }
 
 

src/prog/sprinklerd/src/ubus-sprinkler-model.h

@@ -30,7 +30,7 @@
 
 #include <stdint.h>
 
-#include <ubuscpp/UBusObject.h>
+#include <ubus-cpp/UBusObject.h>
 
 /*--------------------------------- Define ----------------------------------*/
 

src/prog/sprinklersd/builders/cmake/CMakeLists.txt

@@ -1,32 +0,0 @@
-cmake_minimum_required(VERSION 2.8.11)
-
-project(sprinklersd)
-
-include (libubus)
-include (libubox)
-include (libubuscpp)
-include (libjsoncpp)
-
-include_directories(../../src)
-
-set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -pedantic -Werror=strict-aliasing")
-
-file(
-	GLOB_RECURSE
-	source_files
-	../../src/main.cpp
-	../../src/UbusSprinklerModel.cpp
-	../../src/sprinklers.cpp
-)
-
-add_executable (
-        sprinklersd
-        ${source_files}
-)
-
-target_link_libraries (sprinklersd 
-	LINK_PUBLIC
-	jsoncpp
-	ubuscpp
-	rt
-	)