Move implementation of ObjectPoseObserver to library armem_objects

source/RobotAPI/components/ObjectPoseObserver/CMakeLists.txt

@@ -9,7 +9,6 @@ set(COMPONENT_LIBS
     # RobotAPI
     RobotAPI::ComponentPlugins
     RobotAPI::armem_objects
-    ArViz armem
 
     # This project
     ${PROJECT_NAME}Interfaces
@@ -17,19 +16,10 @@ set(COMPONENT_LIBS
 
 set(SOURCES
     ObjectPoseObserver.cpp
-
-    detail/Data.cpp
-    detail/Decay.cpp
-    detail/RobotHeadMovement.cpp
-    detail/Visu.cpp
 )
 set(HEADERS
     ObjectPoseObserver.h
 
-    detail/Data.h
-    detail/Decay.h
-    detail/RobotHeadMovement.h
-    detail/Visu.h
     # Legacy headers.
     plugins/ObjectPoseProviderPlugin.h
     plugins/ObjectPoseClientPlugin.h

source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.h

@@ -31,10 +31,10 @@
 #include <RobotAPI/libraries/RobotAPIComponentPlugins/RobotStateComponentPlugin.h>
 #include <RobotAPI/libraries/armem/server/ComponentPlugin.h>
 
-#include <RobotAPI/components/ObjectPoseObserver/detail/Data.h>
-#include <RobotAPI/components/ObjectPoseObserver/detail/Decay.h>
-#include <RobotAPI/components/ObjectPoseObserver/detail/Visu.h>
-#include <RobotAPI/components/ObjectPoseObserver/detail/RobotHeadMovement.h>
+#include <RobotAPI/libraries/armem_objects/Data.h>
+#include <RobotAPI/libraries/armem_objects/Decay.h>
+#include <RobotAPI/libraries/armem_objects/Visu.h>
+#include <RobotAPI/libraries/armem_objects/RobotHeadMovement.h>
 
 
 #define ICE_CURRENT_ARG const Ice::Current& = Ice::emptyCurrent

source/RobotAPI/libraries/CMakeLists.txt

@@ -19,6 +19,7 @@ add_subdirectory(natik)
 
 add_subdirectory(armem)
 add_subdirectory(armem_gui)
+add_subdirectory(armem_objects)
 add_subdirectory(armem_robot_localization)
 add_subdirectory(armem_robot_mapping)
 add_subdirectory(aron)

source/RobotAPI/libraries/armem_objects/CMakeLists.txt

+set(LIB_NAME    armem_objects)
+
+armarx_component_set_name("${LIB_NAME}")
+armarx_set_target("Library: ${LIB_NAME}")
+
+
+armarx_add_library(
+    LIBS
+        # RobotAPI
+        RobotAPI::Core
+        RobotAPI::ArViz
+        RobotAPI::libraries::armem
+    HEADERS
+        Data.h
+        Decay.h
+        RobotHeadMovement.h
+        Visu.h
+    SOURCES
+        Data.cpp
+        Decay.cpp
+        RobotHeadMovement.cpp
+        Visu.cpp
+)
+
+armarx_enable_aron_file_generation_for_target(
+    TARGET_NAME
+        "${LIB_NAME}"
+    ARON_FILES
+        # aron/ObjectID.xml
+)
+
+add_library(${PROJECT_NAME}::armem_objects ALIAS armem_objects)
+
+# add unit tests
+# add_subdirectory(test)