Skip to content

Commit a4ad49c

Browse files
committed
Quick MySQL docker deployment & code cleaning
1 parent 0ac1046 commit a4ad49c

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ set (PROJECT_NAME cameradar)
2020
project (${PROJECT_NAME})
2121

2222
set (${PROJECT_NAME}_VERSION_MAJOR 0)
23-
set (${PROJECT_NAME}_VERSION_MINOR 1)
24-
set (${PROJECT_NAME}_VERSION_PATCH 1)
23+
set (${PROJECT_NAME}_VERSION_MINOR 2)
24+
set (${PROJECT_NAME}_VERSION_PATCH 0)
2525
set (${PROJECT_NAME}_SUFFIX "-beta")
2626
set (${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}${${PROJECT_NAME}_SUFFIX}")
2727

@@ -92,10 +92,10 @@ link_directories (
9292
)
9393

9494
include_directories (
95-
"cameradar_standalone/include"
96-
"deps/jsoncpp/src/deps.jsoncpp/include"
97-
"deps/boost/src/deps.boost/include"
98-
"deps/mysql-connector/include"
95+
"cameradar_standalone/include"
96+
"deps/jsoncpp/src/deps.jsoncpp/include"
97+
"deps/boost/src/deps.boost/include"
98+
"deps/mysql-connector/include"
9999
)
100100

101101
set (${CAMERADAR_BINARIES} "")

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ The manual installation is recommended if you want to tweak Cameradar and quickl
6363
To install Cameradar you will need these packages
6464

6565
* cmake (`cmake`)
66-
* gstreamer1.x (`libgstreamer1.0-dev`)
67-
* ffmpeg (`ffmpeg`)
68-
* libcurl (`libcurl4-openssl-dev`)
6966

7067
### Steps
7168

@@ -100,6 +97,13 @@ The only dependencies are `docker` and `docker-compose`.
10097
Here is the basic content of the configuration file with simple placeholders :
10198
```json
10299
{
100+
"mysql_db" : {
101+
"host" : "MYSQL_SERVER_IP_ADDRESS",
102+
"port" : MYSQL_SERVER_PORT,
103+
"user": "root",
104+
"password": "root",
105+
"db_name": "cmrdr"
106+
},
103107
"subnets" : "SUBNET1,SUBNET2,SUBNET3,[...]",
104108
"ports" : "PORT1,PORT2,[...]",
105109
"rtsp_url_file" : "conf/url.json",

cache_managers/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,4 @@ set (LIBRARY_OUTPUT_PATH ${CAMERADAR_CACHE_MANAGER_OUTPUT_PATH})
2121
add_subdirectory(dumb_cache_manager)
2222
add_subdirectory(mysql_cache_manager)
2323

24-
message (${CAMERADAR_CACHE_MANAGERS})
2524
set (CAMERADAR_CACHE_MANAGERS ${CAMERADAR_CACHE_MANAGERS} PARENT_SCOPE)
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)