Updating sensor plugin loader and cmake files

- Adding sensor_fusion module to sensor plugin loader.
- Adding fusion folder to master cmake file.

Change-Id: I3ef1329b6c79d2123c458645c2fa6f9532a67988

diff --git a/sensor_plugins.xml.in b/sensor_plugins.xml.in
index eb469c1..9fde9d6 100755 (executable)
--- a/sensor_plugins.xml.in
+++ b/sensor_plugins.xml.in
@@ -16,6 +16,7 @@
                <MODULE path = "/usr/lib/sensord/libproxi_sensor.so"/>
                <MODULE path = "/usr/lib/sensord/liblight_sensor.so"/>
                <MODULE path = "/usr/lib/sensord/libpressure_sensor.so"/>
+               <MODULE path = "/usr/lib/sensord/libfusion_sensor.so"/>
                <MODULE path = "/usr/lib/sensord/liborientation_sensor.so"/>
                <MODULE path = "/usr/lib/sensord/libgravity_sensor.so"/>
                <MODULE path = "/usr/lib/sensord/liblinear_accel_sensor.so"/>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b0b245..556256a 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -58,6 +58,9 @@ ENDIF()
 IF("${SENSOR_FUSION_ENABLE}" STREQUAL "1")
 add_subdirectory(sensor_fusion)
 ENDIF()
+IF("${FUSION}" STREQUAL "ON")
+add_subdirectory(fusion)
+ENDIF()
 IF("${ORIENTATION_ENABLE}" STREQUAL "1")
 add_subdirectory(orientation)
 ENDIF()