The codebase is segregated into 4 directories :libsensord,server,shared and plugins .The plugins directory contains all the sensor plugins under one folder.
Changes: Moved all individual sensor folders into a single folder plugins/
Moved sensor_event definitions files from libsensord(client) to shared as they are being used by plugins/server/client
Change-Id: I42900352c7068cf9fde188a83c92580c62274168
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
IF("${ACCEL}" STREQUAL "ON")
-add_subdirectory(accel)
+add_subdirectory(plugins/accel)
ENDIF()
IF("${GYRO}" STREQUAL "ON")
-add_subdirectory(gyro)
+add_subdirectory(plugins/gyro)
ENDIF()
IF("${PROXI}" STREQUAL "ON")
-add_subdirectory(proxi)
+add_subdirectory(plugins/proxi)
ENDIF()
IF("${LIGHT}" STREQUAL "ON")
-add_subdirectory(light)
+add_subdirectory(plugins/light)
ENDIF()
IF("${GEO}" STREQUAL "ON")
-add_subdirectory(geo)
+add_subdirectory(plugins/geo)
ENDIF()
IF("${AUTO_ROTATION}" STREQUAL "ON")
-add_subdirectory(auto_rotation)
+add_subdirectory(plugins/auto_rotation)
ENDIF()
IF("${PRESSURE}" STREQUAL "ON")
-add_subdirectory(pressure)
+add_subdirectory(plugins/pressure)
ENDIF()
IF("${TEMPERATURE}" STREQUAL "ON")
-add_subdirectory(temperature)
+add_subdirectory(plugins/temperature)
ENDIF()
IF("${HUMIDITY}" STREQUAL "ON")
add_subdirectory(humidity)
ENDIF()
IF("${ULTRAVIOLET}" STREQUAL "ON")
-add_subdirectory(ultraviolet)
+add_subdirectory(plugins/ultraviolet)
ENDIF()
IF("${BIO_LED_RED}" STREQUAL "ON")
-add_subdirectory(bio_led_red)
+add_subdirectory(plugins/bio_led_red)
ENDIF()
IF("${ORIENTATION}" STREQUAL "ON")
set(SENSOR_FUSION_ENABLE "1")
set(LINEAR_ACCELERATION_ENABLE "1")
ENDIF()
IF("${SENSOR_FUSION_ENABLE}" STREQUAL "1")
-add_subdirectory(sensor_fusion)
-add_subdirectory(fusion)
+add_subdirectory(plugins/sensor_fusion)
+add_subdirectory(plugins/fusion)
ENDIF()
IF("${ORIENTATION_ENABLE}" STREQUAL "1")
-add_subdirectory(orientation)
+add_subdirectory(plugins/orientation)
ENDIF()
IF("${GRAVITY_ENABLE}" STREQUAL "1")
-add_subdirectory(gravity)
+add_subdirectory(plugins/gravity)
ENDIF()
IF("${LINEAR_ACCELERATION_ENABLE}" STREQUAL "1")
-add_subdirectory(linear_accel)
+add_subdirectory(plugins/linear_accel)
ENDIF()
IF("${TILT_ENABLE}" STREQUAL "1")
-add_subdirectory(tilt)
+add_subdirectory(plugins/tilt)
ENDIF()
IF("${UNCAL_GYRO_ENABLE}" STREQUAL "1")
-add_subdirectory(uncal_gyro)
+add_subdirectory(plugins/uncal_gyro)
ENDIF()
-add_subdirectory(rotation_vector)
+add_subdirectory(plugins/rotation_vector)
add_subdirectory(server)
add_subdirectory(libsensord)
add_subdirectory(shared)
+
configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc @ONLY)
install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries)
-install(FILES sensor_internal_deprecated.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_internal.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
install(FILES poller.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
install(FILES creg_event_info.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
install(FILES csensor_event_listener.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
install(FILES sensor_info_manager.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
install(FILES csensor_handle_info.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
install(FILES client_common.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_accel.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_geomag.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_light.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_proxi.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_gyro.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_pressure.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_context.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_auto_rotation.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_gravity.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_linear_accel.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_orientation.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_tilt.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_rv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_geomagnetic_rv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_gaming_rv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_temperature.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_motion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_fusion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_ultraviolet.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_bio_led_red.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_deprecated.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-install(FILES sensor_uncal_gyro.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
install(FILES ${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
-include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion)
+include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
FOREACH(flag ${fusion_pkgs_LDFLAGS})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
-include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion)
+include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
FOREACH(flag ${gravity_pkgs_LDFLAGS})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
-include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion)
+include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
FOREACH(flag ${linear_accel_pkgs_LDFLAGS})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
-include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion)
+include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
FOREACH(flag ${orientation_pkgs_LDFLAGS})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
-include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion)
+include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
FOREACH(flag ${gaming_rv_pkgs_LDFLAGS})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
-include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion)
+include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
FOREACH(flag ${geomagnetic_rv_pkgs_LDFLAGS})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
-include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion)
+include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
FOREACH(flag ${rv_pkgs_LDFLAGS})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
-include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion)
+include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
FOREACH(flag ${tilt_pkgs_LDFLAGS})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
-include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion)
+include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
FOREACH(flag ${gravity_pkgs_LDFLAGS})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
sensor_common.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor
)
+install(FILES sensor_accel.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_geomag.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_light.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_proxi.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_gyro.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_pressure.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_context.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_auto_rotation.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_gravity.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_linear_accel.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_orientation.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_tilt.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_rv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_geomagnetic_rv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_gaming_rv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_temperature.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_motion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_fusion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_ultraviolet.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_bio_led_red.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_deprecated.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_uncal_gyro.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_internal_deprecated.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_internal.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)