From 99712a5730f14d899111f4e98e9fe068a2a571a8 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Tue, 30 Nov 2021 16:29:59 +0100
Subject: [PATCH] Update servers
---
.../armem/client/ExampleMemoryClient/CMakeLists.txt | 4 +++-
.../ExampleMemoryClient/ExampleMemoryClient.cpp | 1 -
.../armem/server/MotionMemory/CMakeLists.txt | 11 +++++------
.../armem/server/RobotStateMemory/CMakeLists.txt | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/source/RobotAPI/components/armem/client/ExampleMemoryClient/CMakeLists.txt b/source/RobotAPI/components/armem/client/ExampleMemoryClient/CMakeLists.txt
index 667e5d5ad..b9434aeb6 100644
--- a/source/RobotAPI/components/armem/client/ExampleMemoryClient/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/client/ExampleMemoryClient/CMakeLists.txt
@@ -7,7 +7,9 @@ armarx_build_if(OpenCV_FOUND "OpenCV not available")
set(COMPONENT_LIBS
ArmarXCore ArmarXCoreInterfaces # for DebugObserverInterface
ArmarXGuiComponentPlugins
- RobotAPICore RobotAPIInterfaces armem aronopencvconverter aronjsonconverter
+ RobotAPICore RobotAPIInterfaces
+ armem
+ aronopencvconverter aronjsonconverter
${OpenCV_LIBRARIES}
)
diff --git a/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp b/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
index eae52c505..d5ffd4c91 100644
--- a/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
+++ b/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
@@ -597,7 +597,6 @@ namespace armarx
if (tab.queryResult)
{
- tab.queryResultGroup = armem::server::MemoryRemoteGui().makeGroupBox(*tab.queryResult);
}
VBoxLayout root = {tab.queryResultGroup, VSpacer()};
diff --git a/source/RobotAPI/components/armem/server/MotionMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/MotionMemory/CMakeLists.txt
index 7d2017104..2762e4152 100644
--- a/source/RobotAPI/components/armem/server/MotionMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/MotionMemory/CMakeLists.txt
@@ -8,20 +8,19 @@ armarx_add_component(
RobotAPICore
RobotAPIInterfaces
RobotAPI::armem_server
- RobotAPI::ArMemMotions
- RobotAPI::armem_mps
+ RobotAPI::armem_motions_server
+ RobotAPI::armem_mps_server
+
SOURCES
MotionMemory.cpp
+
HEADERS
MotionMemory.h
)
# add unit tests
-add_subdirectory(test)
+# add_subdirectory(test)
#generate the application
armarx_generate_and_add_component_executable()
-
-
-
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt
index 7dc9f54a2..24c661694 100644
--- a/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt
@@ -10,8 +10,8 @@ set(COMPONENT_LIBS
# RobotAPI
RobotAPICore RobotAPIInterfaces
RobotAPIComponentPlugins
- armem_server
- armem_robot_state
+ RobotAPI::armem_server
+ RobotAPI::armem_robot_state_server
)
set(SOURCES
--
GitLab