Quick MySQL docker deployment & code cleaning

CMakeLists.txt

@@ -20,8 +20,8 @@ set (PROJECT_NAME cameradar)
 project (${PROJECT_NAME})
 
 set (${PROJECT_NAME}_VERSION_MAJOR 0)
-set (${PROJECT_NAME}_VERSION_MINOR 1)
+set (${PROJECT_NAME}_VERSION_MINOR 2)
-set (${PROJECT_NAME}_VERSION_PATCH 1)
+set (${PROJECT_NAME}_VERSION_PATCH 0)
 set (${PROJECT_NAME}_SUFFIX "-beta")
 set (${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}${${PROJECT_NAME}_SUFFIX}")
 
@@ -92,10 +92,10 @@ link_directories (
 )
 
 include_directories (
-        "cameradar_standalone/include"
+    "cameradar_standalone/include"
-        "deps/jsoncpp/src/deps.jsoncpp/include"
+    "deps/jsoncpp/src/deps.jsoncpp/include"
-        "deps/boost/src/deps.boost/include"
+    "deps/boost/src/deps.boost/include"
-        "deps/mysql-connector/include"
+    "deps/mysql-connector/include"
 )
 
 set (${CAMERADAR_BINARIES} "")

README.md

@@ -63,9 +63,6 @@ The manual installation is recommended if you want to tweak Cameradar and quickl
 To install Cameradar you will need these packages
 
 * cmake (`cmake`)
-* gstreamer1.x (`libgstreamer1.0-dev`)
-* ffmpeg (`ffmpeg`)
-* libcurl (`libcurl4-openssl-dev`)
 
 ### Steps
 
@@ -100,6 +97,13 @@ The only dependencies are `docker` and `docker-compose`.
 Here is the basic content of the configuration file with simple placeholders :
 ```json
 {
+  "mysql_db" : {
+     "host" : "MYSQL_SERVER_IP_ADDRESS",
+     "port" : MYSQL_SERVER_PORT,
+     "user": "root",
+     "password": "root",
+     "db_name": "cmrdr"
+  },
   "subnets" : "SUBNET1,SUBNET2,SUBNET3,[...]",
   "ports" : "PORT1,PORT2,[...]",
   "rtsp_url_file" : "conf/url.json",

cache_managers/CMakeLists.txt

@@ -21,5 +21,4 @@ set (LIBRARY_OUTPUT_PATH ${CAMERADAR_CACHE_MANAGER_OUTPUT_PATH})
 add_subdirectory(dumb_cache_manager)
 add_subdirectory(mysql_cache_manager)
 
-message (${CAMERADAR_CACHE_MANAGERS})
 set (CAMERADAR_CACHE_MANAGERS ${CAMERADAR_CACHE_MANAGERS} PARENT_SCOPE)