Skip to content
Snippets Groups Projects
Commit 99712a57 authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Update servers

parent 5f2a0b71
No related branches found
No related tags found
1 merge request!202Resolve "Split armem into core and server lib"
......@@ -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}
)
......
......@@ -597,7 +597,6 @@ namespace armarx
if (tab.queryResult)
{
tab.queryResultGroup = armem::server::MemoryRemoteGui().makeGroupBox(*tab.queryResult);
}
VBoxLayout root = {tab.queryResultGroup, VSpacer()};
......
......@@ -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()
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment