From 936931d34934d9584b9b46243fb5e874e845d022 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Tue, 30 Nov 2021 16:10:40 +0100
Subject: [PATCH] Update servers

---
 .../components/armem/server/ExampleMemory/CMakeLists.txt       | 3 ++-
 .../armem/server/GeneralPurposeMemory/CMakeLists.txt           | 2 +-
 .../components/armem/server/GraspMemory/CMakeLists.txt         | 2 +-
 .../components/armem/server/MotionMemory/CMakeLists.txt        | 2 +-
 .../components/armem/server/ObjectMemory/CMakeLists.txt        | 2 ++
 .../components/armem/server/RobotStateMemory/CMakeLists.txt    | 2 +-
 .../components/armem/server/SkillsMemory/CMakeLists.txt        | 2 +-
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/source/RobotAPI/components/armem/server/ExampleMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/ExampleMemory/CMakeLists.txt
index de9b660b2..b1a522442 100644
--- a/source/RobotAPI/components/armem/server/ExampleMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/ExampleMemory/CMakeLists.txt
@@ -6,7 +6,8 @@ armarx_build_if(OpenCV_FOUND "OpenCV not available")
 set(COMPONENT_LIBS
     ArmarXCore ArmarXCoreInterfaces  # for DebugObserverInterface
     ArmarXGuiComponentPlugins
-    RobotAPICore RobotAPIInterfaces armem
+    RobotAPICore RobotAPIInterfaces
+    armem_server
 )
 
 set(SOURCES
diff --git a/source/RobotAPI/components/armem/server/GeneralPurposeMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/GeneralPurposeMemory/CMakeLists.txt
index f0521043e..278e9c29a 100644
--- a/source/RobotAPI/components/armem/server/GeneralPurposeMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/GeneralPurposeMemory/CMakeLists.txt
@@ -4,7 +4,7 @@ armarx_component_set_name("GeneralPurposeMemory")
 set(COMPONENT_LIBS
     ArmarXCore ArmarXCoreInterfaces  # for DebugObserverInterface
     ArmarXGuiComponentPlugins
-    RobotAPICore RobotAPIInterfaces armem
+    RobotAPICore RobotAPIInterfaces armem_server
     # RobotAPIComponentPlugins  # for ArViz and other plugins
 
     ${IVT_LIBRARIES}
diff --git a/source/RobotAPI/components/armem/server/GraspMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/GraspMemory/CMakeLists.txt
index 7bac572cd..6f09f46f7 100644
--- a/source/RobotAPI/components/armem/server/GraspMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/GraspMemory/CMakeLists.txt
@@ -4,7 +4,7 @@ armarx_component_set_name("GraspMemory")
 set(COMPONENT_LIBS
     ArmarXCore ArmarXCoreInterfaces  # for DebugObserverInterface
     ArmarXGuiComponentPlugins
-    RobotAPICore RobotAPIInterfaces armem
+    RobotAPICore RobotAPIInterfaces armem_server
     RobotAPIComponentPlugins  # for ArViz and other plugins
 
     ${IVT_LIBRARIES}
diff --git a/source/RobotAPI/components/armem/server/MotionMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/MotionMemory/CMakeLists.txt
index 4b9a866f9..7d2017104 100644
--- a/source/RobotAPI/components/armem/server/MotionMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/MotionMemory/CMakeLists.txt
@@ -7,7 +7,7 @@ armarx_add_component(
         ArmarXGuiComponentPlugins
         RobotAPICore
         RobotAPIInterfaces
-        RobotAPI::ArMem
+        RobotAPI::armem_server
         RobotAPI::ArMemMotions
         RobotAPI::armem_mps
     SOURCES
diff --git a/source/RobotAPI/components/armem/server/ObjectMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/ObjectMemory/CMakeLists.txt
index 1c90c244b..ac589f21a 100644
--- a/source/RobotAPI/components/armem/server/ObjectMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/ObjectMemory/CMakeLists.txt
@@ -8,7 +8,9 @@ set(COMPONENT_LIBS
     ArmarXGuiComponentPlugins
     # RobotAPI
     RobotAPI::ComponentPlugins
+    RobotAPI::armem_server
     RobotAPI::armem_objects
+    RobotAPI::armem_objects_server
 
     # This project
     ${PROJECT_NAME}Interfaces
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt
index f49cb33c2..7dc9f54a2 100644
--- a/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt
@@ -10,7 +10,7 @@ set(COMPONENT_LIBS
     # RobotAPI
     RobotAPICore RobotAPIInterfaces
     RobotAPIComponentPlugins
-    armem
+    armem_server
     armem_robot_state
 )
 
diff --git a/source/RobotAPI/components/armem/server/SkillsMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/SkillsMemory/CMakeLists.txt
index eee41fad2..dda3d1f24 100644
--- a/source/RobotAPI/components/armem/server/SkillsMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/SkillsMemory/CMakeLists.txt
@@ -4,7 +4,7 @@ armarx_component_set_name("SkillsMemory")
 set(COMPONENT_LIBS
     ArmarXCore ArmarXCoreInterfaces
     RobotAPICore RobotAPIInterfaces
-    armem armem_skills
+    armem_server armem_skills
 
     ${IVT_LIBRARIES}
 )
-- 
GitLab