Merge branch 'master' of gitlab.tuebingen.mpg.de:sgomez/ball_tracking into dev

CMakeLists.txt

@@ -4,8 +4,8 @@ project(ball_tracking)
 add_definitions(-DBOOST_LOG_DYN_LINK)
 find_package( Boost 1.58 COMPONENTS log REQUIRED )
 
-find_package(OpenCV REQUIRED)
-find_package(CUDA 8.0)
+find_package(OpenCV 3.4 REQUIRED)
+find_package(CUDA 10.0)
 find_package(Armadillo REQUIRED)
 
 find_library(ZMQPP NAMES zmqpp)
@@ -24,6 +24,7 @@ endif (CUDA_FOUND)
 if (WITH_CUDA)
   include_directories(
     ${CUDA_INCLUDE_DIRS}
+    ${OpenCV_INCLUDES}
     include
     )
   add_definitions(-DWITH_CUDA)
@@ -37,6 +38,7 @@ if (WITH_CUDA)
   set(GPU_BT_LIB
     cu_ball_track
     )
+  install(TARGETS cu_ball_track DESTINATION lib)
 endif(WITH_CUDA)
 
 include_directories(include

src/server.cpp

@@ -64,6 +64,7 @@ namespace ball_tracking {
       void start_server(const json& conf) {
         if (conf.count("log")) set_log_config(conf.at("log"));
         start_time = high_resolution_clock::now();
+        BOOST_LOG_TRIVIAL(info) << "Tracking server started at time " << start_time.time_since_epoch().count();
 
         //1) Start the networking sockets
         const json& srv_conf = conf.at("servers");