Switch to cmake build system

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
-project(CameraManagerRoot)
+project(CameraManager)
 add_subdirectory(src)
-add_subdirectory(test EXCLUDE_FROM_ALL)
+add_subdirectory(test)
 

cmake/FindAvahi.cmake

@@ -1,5 +1,6 @@
 # Copyright (c) 2015 Damien Buhl (alias daminetreg)
 # All rights reserved.
+# https://github.com/ruslo/hunter
 
 # Try to find Avahi client and libdns_sd_compat library.
 # It can be used as :

src/CMakeLists.txt

@@ -32,7 +32,26 @@ add_definitions(
     -Wno-missing-field-initializers
 )
 
-file(GLOB SRC_FILES *.cpp)
+file(GLOB SRC_FILES 
+    avahi_publisher.cpp
+    conf_file.cpp
+    main.cpp
+    pollable.cpp    
+    VideoCaptureGst.cpp
+    CameraComponent.cpp
+    glib_mainloop.cpp
+    mainloop.cpp
+    socket.cpp
+    VideoStreamRtsp.cpp
+    CameraParameters.cpp
+    ImageCaptureGst.cpp
+    mavlink_server.cpp
+    util.cpp
+    VideoStreamUdp.cpp
+    CameraServer.cpp
+    log.cpp
+    PluginManager.cpp
+    v4l2_interface.cpp)
 
 add_executable(${PROJECT_NAME}
     ${SRC_FILES}
@@ -74,69 +93,70 @@ option(WITH_GAZEBO "Enable support for Gazebo simulated cameras" OFF)
 option(WITH_AERO "Enable support for Intel Aero cameras" OFF)
 option(WITH_CUSTOM "Enable support for Custom cameras" OFF)
 
-IF(WITH_MAVLINK)
+if(WITH_MAVLINK)
     add_definitions(-DENABLE_MAVLINK)
-ENDIF(WITH_MAVLINK)
+endif(WITH_MAVLINK)
 
-IF(WITH_AERO)
+if(WITH_AERO)
     add_definitions(-DENABLE_AERO)
     add_subdirectory(Plugins/AeroAtomIspCamera)
     target_link_libraries(${PROJECT_NAME}
          AeroAtomIspCamera
     )
-ENDIF(WITH_AERO)
+endif(WITH_AERO)
 
-IF(WITH_CUSTOM)
+if(WITH_CUSTOM)
     add_definitions(-DENABLE_CUSTOM)
     add_subdirectory(Plugins/CustomCamera)
     target_link_libraries(${PROJECT_NAME}
          CustomCamera
     )
-ENDIF(WITH_CUSTOM)
+endif(WITH_CUSTOM)
 
-IF(WITH_AVAHI)
+if(WITH_AVAHI)
     find_package(Avahi QUIET)
-    IF(Avahi_FOUND)
+    if(Avahi_FOUND)
         add_definitions(-DENABLE_AVAHI)
         target_link_libraries(${PROJECT_NAME}
             Avahi::client
             Avahi::glib
         )
         MESSAGE(STATUS "Found Avahi: ${Avahi_CLIENT_INCLUDE_DIRS}")
-    ENDIF(Avahi_FOUND)
-ENDIF(WITH_AVAHI)
+    endif(Avahi_FOUND)
+endif(WITH_AVAHI)
 
-IF(WITH_GAZEBO)
+if(WITH_GAZEBO)
     find_package(gazebo QUIET)
-    IF(gazebo_FOUND)
+    if(gazebo_FOUND)
         add_subdirectory(Plugins/GazeboCamera)
         add_definitions(-DENABLE_GAZEBO)
         target_link_libraries(${PROJECT_NAME}
             GazeboCamera
             ${GAZEBO_LIBRARIES}
         )
         MESSAGE(STATUS "Found Gazebo: ${GAZEBO_LIBRARIES}")
-    ENDIF(gazebo_FOUND)
-ENDIF(WITH_GAZEBO)
+    endif(gazebo_FOUND)
+endif(WITH_GAZEBO)
 
-IF(WITH_REALSENSE)
+if(WITH_REALSENSE)
     FIND_PACKAGE(RealSense QUIET)
-    IF(RealSense_FOUND)
+    if(RealSense_FOUND)
         add_subdirectory(Plugins/RealSenseCamera)
         add_definitions(-DENABLE_REALSENSE)
         target_link_libraries(${PROJECT_NAME}
             RealSenseCamera
             ${RealSense_LIBRARIES}
         )
         MESSAGE(STATUS "Found RealSense: ${RealSense_INCLUDE_DIRS}")
-    ENDIF(RealSense_FOUND)
-ENDIF(WITH_REALSENSE)
+    endif(RealSense_FOUND)
+endif(WITH_REALSENSE)
 
 # RealSense2
+# Currently not supported - but it will be in the future
 #FIND_PACKAGE(RealSense2 QUIET)
-#IF(RealSense2_FOUND)
+#if(RealSense2_FOUND)
 #    MESSAGE(STATUS "Found RealSense2: ${RealSense2_INCLUDE_DIRS}")
-#ENDIF(RealSense2_FOUND)
+#endif(RealSense2_FOUND)
 
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 

src/Plugins/AeroAtomIspCamera/CMakeLists.txt

@@ -1,7 +1,9 @@
-file(GLOB SRC_FILES *.cpp)
+file(GLOB SRC_FILES
+    CameraDeviceAeroAtomIsp.cpp
+    PluginAeroAtomIsp.cpp)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../..
 )
 
-add_library(AeroAtomIspCamera ${SRC_FILES})
+add_library(AeroAtomIspCamera ${SRC_FILES})

src/Plugins/CustomCamera/CMakeLists.txt

@@ -1,7 +1,9 @@
-file(GLOB SRC_FILES *.cpp)
+file(GLOB SRC_FILES
+    CameraDeviceCustom.cpp
+    PluginCustom.cpp)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../..
 )
 
-add_library(CustomCamera ${SRC_FILES})
+add_library(CustomCamera ${SRC_FILES})

src/Plugins/GazeboCamera/CMakeLists.txt

@@ -1,10 +1,12 @@
 find_package(gazebo REQUIRED)
 
-file(GLOB SRC_FILES *.cpp)
+file(GLOB SRC_FILES
+    CameraDeviceGazebo.cpp
+    PluginGazebo.cpp)
 
 include_directories(
     ${GAZEBO_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}/../..
 )
 
-add_library(GazeboCamera ${SRC_FILES})
+add_library(GazeboCamera ${SRC_FILES})

src/Plugins/RealSenseCamera/CMakeLists.txt

@@ -1,7 +1,9 @@
-file(GLOB SRC_FILES *.cpp)
+file(GLOB SRC_FILES
+    CameraDeviceRealSense.cpp
+    PluginRealSense.cpp)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../..
 )
 
-add_library(RealSenseCamera ${SRC_FILES})
+add_library(RealSenseCamera ${SRC_FILES})

src/Plugins/V4l2Camera/CMakeLists.txt

@@ -1,7 +1,9 @@
-file(GLOB SRC_FILES *.cpp)
+file(GLOB SRC_FILES
+     CameraDeviceV4l2.cpp
+     PluginV4l2.cpp)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../..
 )
 
-add_library(V4l2Camera ${SRC_FILES})
+add_library(V4l2Camera ${SRC_FILES})