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

Update servers

parent 49245f78
No related branches found
No related tags found
1 merge request!202Resolve "Split armem into core and server lib"
...@@ -6,7 +6,8 @@ armarx_build_if(OpenCV_FOUND "OpenCV not available") ...@@ -6,7 +6,8 @@ armarx_build_if(OpenCV_FOUND "OpenCV not available")
set(COMPONENT_LIBS set(COMPONENT_LIBS
ArmarXCore ArmarXCoreInterfaces # for DebugObserverInterface ArmarXCore ArmarXCoreInterfaces # for DebugObserverInterface
ArmarXGuiComponentPlugins ArmarXGuiComponentPlugins
RobotAPICore RobotAPIInterfaces armem RobotAPICore RobotAPIInterfaces
armem_server
) )
set(SOURCES set(SOURCES
......
...@@ -4,7 +4,7 @@ armarx_component_set_name("GeneralPurposeMemory") ...@@ -4,7 +4,7 @@ armarx_component_set_name("GeneralPurposeMemory")
set(COMPONENT_LIBS set(COMPONENT_LIBS
ArmarXCore ArmarXCoreInterfaces # for DebugObserverInterface ArmarXCore ArmarXCoreInterfaces # for DebugObserverInterface
ArmarXGuiComponentPlugins ArmarXGuiComponentPlugins
RobotAPICore RobotAPIInterfaces armem RobotAPICore RobotAPIInterfaces armem_server
# RobotAPIComponentPlugins # for ArViz and other plugins # RobotAPIComponentPlugins # for ArViz and other plugins
${IVT_LIBRARIES} ${IVT_LIBRARIES}
......
...@@ -4,7 +4,7 @@ armarx_component_set_name("GraspMemory") ...@@ -4,7 +4,7 @@ armarx_component_set_name("GraspMemory")
set(COMPONENT_LIBS set(COMPONENT_LIBS
ArmarXCore ArmarXCoreInterfaces # for DebugObserverInterface ArmarXCore ArmarXCoreInterfaces # for DebugObserverInterface
ArmarXGuiComponentPlugins ArmarXGuiComponentPlugins
RobotAPICore RobotAPIInterfaces armem RobotAPICore RobotAPIInterfaces armem_server
RobotAPIComponentPlugins # for ArViz and other plugins RobotAPIComponentPlugins # for ArViz and other plugins
${IVT_LIBRARIES} ${IVT_LIBRARIES}
......
...@@ -7,7 +7,7 @@ armarx_add_component( ...@@ -7,7 +7,7 @@ armarx_add_component(
ArmarXGuiComponentPlugins ArmarXGuiComponentPlugins
RobotAPICore RobotAPICore
RobotAPIInterfaces RobotAPIInterfaces
RobotAPI::ArMem RobotAPI::armem_server
RobotAPI::ArMemMotions RobotAPI::ArMemMotions
RobotAPI::armem_mps RobotAPI::armem_mps
SOURCES SOURCES
......
...@@ -8,7 +8,9 @@ set(COMPONENT_LIBS ...@@ -8,7 +8,9 @@ set(COMPONENT_LIBS
ArmarXGuiComponentPlugins ArmarXGuiComponentPlugins
# RobotAPI # RobotAPI
RobotAPI::ComponentPlugins RobotAPI::ComponentPlugins
RobotAPI::armem_server
RobotAPI::armem_objects RobotAPI::armem_objects
RobotAPI::armem_objects_server
# This project # This project
${PROJECT_NAME}Interfaces ${PROJECT_NAME}Interfaces
......
...@@ -10,7 +10,7 @@ set(COMPONENT_LIBS ...@@ -10,7 +10,7 @@ set(COMPONENT_LIBS
# RobotAPI # RobotAPI
RobotAPICore RobotAPIInterfaces RobotAPICore RobotAPIInterfaces
RobotAPIComponentPlugins RobotAPIComponentPlugins
armem armem_server
armem_robot_state armem_robot_state
) )
......
...@@ -4,7 +4,7 @@ armarx_component_set_name("SkillsMemory") ...@@ -4,7 +4,7 @@ armarx_component_set_name("SkillsMemory")
set(COMPONENT_LIBS set(COMPONENT_LIBS
ArmarXCore ArmarXCoreInterfaces ArmarXCore ArmarXCoreInterfaces
RobotAPICore RobotAPIInterfaces RobotAPICore RobotAPIInterfaces
armem armem_skills armem_server armem_skills
${IVT_LIBRARIES} ${IVT_LIBRARIES}
) )
......
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