Merge branch 'master' of https://i61wiki.itec.uka.de/git/robot-api

source/RobotAPI/applications/MotionControlTest/CMakeLists.txt

@@ -18,7 +18,9 @@ armarx_build_if(ArmarXCoreObservers_ENABLED "ArmarXCoreObservers library disable
 
 
 if (ARMARX_BUILD)
-    set(COMPONENT_LIBS MotionControl RobotAPICore ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreRobotStateComponent ArmarXCoreStatechart ArmarXCoreOperations)
+    include_directories(${Eigen3_INCLUDE_DIR})
+    include_directories(${Simox_INCLUDE_DIRS})
+    set(COMPONENT_LIBS MotionControl RobotAPICore ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreRobotStateComponent ArmarXCoreStatechart ArmarXCoreOperations ${Simox_LIBRARIES})
 
     set(SOURCES "")
     set(HEADERS MotionControlTestApp.h)

source/RobotAPI/applications/TCPControlUnit/CMakeLists.txt

@@ -18,7 +18,9 @@ armarx_build_if(ArmarXCoreObservers_ENABLED "ArmarXCoreObservers library disable
 
 
 if (ARMARX_BUILD)
-    set(COMPONENT_LIBS RobotAPIUnits RobotAPICore RobotAPIInterfaces  ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreRemoteRobot)
+    include_directories(${Eigen3_INCLUDE_DIR})
+    include_directories(${Simox_INCLUDE_DIRS})
+    set(COMPONENT_LIBS RobotAPIUnits RobotAPICore RobotAPIInterfaces  ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreRemoteRobot ${Simox_LIBRARIES})
 
     set(SOURCES "")
     set(HEADERS TCPControlUnitApp.h)

source/RobotAPI/core/CMakeLists.txt

@@ -9,13 +9,13 @@ armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
 
 if (ARMARX_BUILD)
     include_directories(${Eigen3_INCLUDE_DIR})
-    include_directories(${VirtualRobot_INCLUDE_DIRS})
+    include_directories(${Simox_INCLUDE_DIRS})
 
     set(LIB_NAME       RobotAPICore)
     set(LIB_VERSION    0.1.0)
     set(LIB_SOVERSION  0)
 
-    set(LIBS RobotAPIInterfaces ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreStatechart ArmarXCoreRobotStateComponent ${VirtualRobot_LIBRARIES})
+    set(LIBS RobotAPIInterfaces ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreStatechart ArmarXCoreRobotStateComponent ${Simox_LIBRARIES})
 
     set(LIB_FILES RobotStatechartContext.cpp
     )

source/RobotAPI/motioncontrol/CMakeLists.txt

@@ -9,13 +9,13 @@ armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
 
 if (ARMARX_BUILD)
     include_directories(${Eigen3_INCLUDE_DIR})
-    include_directories(${VirtualRobot_INCLUDE_DIRS})
+    include_directories(${Simox_INCLUDE_DIRS})
 
     set(LIB_NAME       MotionControl)
     set(LIB_VERSION    0.1.0)
     set(LIB_SOVERSION  0)
 
-    set(LIBS RobotAPICore RobotAPIInterfaces ArmarXInterfaces ArmarXCore ArmarXCoreObservers)
+    set(LIBS RobotAPICore RobotAPIInterfaces ArmarXInterfaces ArmarXCore ArmarXCoreObservers ${Simox_LIBRARIES})
 
     set(LIB_FILES MotionControl.cpp
          ZeroForceControl.cpp)

source/RobotAPI/units/CMakeLists.txt

@@ -9,13 +9,13 @@ armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
 
 if (ARMARX_BUILD)
     include_directories(${Eigen3_INCLUDE_DIR})
-    include_directories(${VirtualRobot_INCLUDE_DIRS})
+    include_directories(${Simox_INCLUDE_DIRS})
 
     set(LIB_NAME       RobotAPIUnits)
     set(LIB_VERSION    0.1.0)
     set(LIB_SOVERSION  0)
 
-    set(LIBS RobotAPIInterfaces RobotAPICore ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreRemoteRobot  ${VirtualRobot_LIBRARIES})
+    set(LIBS RobotAPIInterfaces RobotAPICore ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreRemoteRobot  ${Simox_LIBRARIES})
 
     set(LIB_HEADERS
         ForceTorqueObserver.h