From 298cde361d546fd3d291a02e5093015012f5cd8f Mon Sep 17 00:00:00 2001
From: NADAL Jean-Baptiste <jean.baptiste@nadal-fr.com>
Date: Fri, 21 Apr 2017 23:24:55 +0200
Subject: [PATCH] Fix compilation of chacond.

---
 .../chacond/builders/cmake/CMakeLists.txt     | 32 ++++++++++---------
 src/prog/chacond/src/{Chacon.c => chacon.c}   |  0
 src/prog/chacond/src/main.c                   |  2 +-
 .../chacond/src/{UBusModel.c => ubus-model.c} |  1 +
 .../chacond/src/{UbusModel.h => ubus-model.h} |  0
 5 files changed, 19 insertions(+), 16 deletions(-)
 rename src/prog/chacond/src/{Chacon.c => chacon.c} (100%)
 rename src/prog/chacond/src/{UBusModel.c => ubus-model.c} (99%)
 rename src/prog/chacond/src/{UbusModel.h => ubus-model.h} (100%)

diff --git a/src/prog/chacond/builders/cmake/CMakeLists.txt b/src/prog/chacond/builders/cmake/CMakeLists.txt
index 8784045f..d37dd658 100644
--- a/src/prog/chacond/builders/cmake/CMakeLists.txt
+++ b/src/prog/chacond/builders/cmake/CMakeLists.txt
@@ -1,30 +1,32 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.0)
 
 project(chacond)
 
-include (libubus)
-include (libubox)
-include (wiringPi)
+set (CMAKE_MODULE_PATH "${MODULE_PATH}")
 
-include_directories(../../src)
+include (br)
 
-file(
+include_directories ($ENV{SRC_DIR}/src/prog/chacond)
+
+file (
 	GLOB_RECURSE
 	source_files
-	../../src/main.c
-	../../src/UBusModel.c
-	../../src/Chacon.c
+
+	$ENV{SRC_DIR}/src/prog/chacond/src/main.c
+	$ENV{SRC_DIR}/src/prog/chacond/src/ubus-model.c
+	$ENV{SRC_DIR}/src/prog/chacond/src/chacon.c
 )
 
-add_executable (
-        chacond
-        ${source_files}
-)
+add_executable (chacond ${source_files})
 
 target_link_libraries (chacond 
 	LINK_PUBLIC
-	ubus 
+	ubox
+	ubus
+	blobmsg_json
 	wiringPi
 	rt
 	pthread
-	)
+)
+
+install (TARGETS chacond DESTINATION local/bin)
\ No newline at end of file
diff --git a/src/prog/chacond/src/Chacon.c b/src/prog/chacond/src/chacon.c
similarity index 100%
rename from src/prog/chacond/src/Chacon.c
rename to src/prog/chacond/src/chacon.c
diff --git a/src/prog/chacond/src/main.c b/src/prog/chacond/src/main.c
index cfe32f45..f0fd0b24 100644
--- a/src/prog/chacond/src/main.c
+++ b/src/prog/chacond/src/main.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "UbusModel.h"
+#include "ubus-model.h"
 #include "chacon.h"
 
 
diff --git a/src/prog/chacond/src/UBusModel.c b/src/prog/chacond/src/ubus-model.c
similarity index 99%
rename from src/prog/chacond/src/UBusModel.c
rename to src/prog/chacond/src/ubus-model.c
index 6e81e875..f51ec627 100644
--- a/src/prog/chacond/src/UBusModel.c
+++ b/src/prog/chacond/src/ubus-model.c
@@ -29,6 +29,7 @@
 #include <signal.h>
 
 #include <libubox/blobmsg_json.h>
+
 #include <libubus.h>
 
 /*------------------------------- DECLARATION -------------------------------*/
diff --git a/src/prog/chacond/src/UbusModel.h b/src/prog/chacond/src/ubus-model.h
similarity index 100%
rename from src/prog/chacond/src/UbusModel.h
rename to src/prog/chacond/src/ubus-model.h