Skip to content
Snippets Groups Projects
Commit f48722a8 authored by Jonas Rauber's avatar Jonas Rauber
Browse files

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

parents 1c1af8b5 f3558f0a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 87 additions and 145 deletions
source/RobotAPI/applications/ForceTorqueObserver/CMakeLists.txt
+ 6
− 11
View file @ f48722a8
......@@ -4,18 +4,13 @@ armarx_component_set_name(ForceTorqueObserver)
find_package(Eigen3 QUIET)
armarx_build_if(Eigen3_FOUND "Eigen3 not available")
find_package(Simox QUIET)
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
if(Eigen3_FOUND AND Simox_FOUND)
include_directories(${Eigen3_INCLUDE_DIR})
include_directories(${Simox_INCLUDE_DIRS})
if (Eigen3_FOUND)
include_directories(
${Eigen3_INCLUDE_DIR})
endif()
if(ARMARX_BUILD)
set(COMPONENT_LIBS RobotAPIUnits RobotAPICore RobotAPIInterfaces ArmarXInterfaces ArmarXCore ArmarXCoreObservers RobotAPIRemoteRobot)
set(COMPONENT_LIBS RobotAPIUnits)
set(SOURCES main.cpp ForceTorqueObserverApp.h)
set(EXE_SOURCE main.cpp ForceTorqueObserverApp.h)
armarx_add_component_executable("${SOURCES}")
endif()
armarx_add_component_executable("${EXE_SOURCE}")
source/RobotAPI/applications/ForceTorqueUnitSimulation/CMakeLists.txt
+ 8
− 12
View file @ f48722a8
armarx_component_set_name(ForceTorqueUnitSimulation)
find_package(Eigen3 QUIET)
armarx_build_if(Simox_FOUND "Eigen3 not available")
armarx_build_if(Eigen3_FOUND "Eigen3 not available")
find_package(Simox QUIET)
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
if(Eigen3_FOUND AND Simox_FOUND)
include_directories(${Eigen3_INCLUDE_DIR})
include_directories(${Simox_INCLUDE_DIRS})
if (Eigen3_FOUND)
include_directories(
${Eigen3_INCLUDE_DIR})
endif()
if(ARMARX_BUILD)
set(COMPONENT_LIBS ArmarXInterfaces ArmarXCore RobotAPIUnits)
set(SOURCES main.cpp ForceTorqueUnitSimulationApp.h)
set(COMPONENT_LIBS RobotAPIUnits)
armarx_add_component_executable("${SOURCES}")
endif()
set(SOURCES main.cpp ForceTorqueUnitSimulationApp.h)
armarx_add_component_executable("${SOURCES}")
source/RobotAPI/applications/HapticObserver/CMakeLists.txt
+ 1
− 1
View file @ f48722a8
......@@ -8,7 +8,7 @@ if (Eigen3_FOUND)
${Eigen3_INCLUDE_DIR})
endif()
set(COMPONENT_LIBS ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreEigen3Variants WeissHapticSensorListener RobotAPIUnits)
set(COMPONENT_LIBS WeissHapticSensorListener RobotAPIUnits)
set(EXE_SOURCE main.cpp HapticObserverApp.h)
......
source/RobotAPI/applications/HeadIKUnit/CMakeLists.txt
+ 9
− 8
View file @ f48722a8
......@@ -4,17 +4,18 @@ armarx_component_set_name(HeadIKUnit)
find_package(Eigen3 QUIET)
armarx_build_if(Eigen3_FOUND "Eigen3 not available")
find_package(Simox QUIET)
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
if (Eigen3_FOUND AND Simox_FOUND)
if (Eigen3_FOUND)
include_directories(
${Eigen3_INCLUDE_DIR}
${Simox_INCLUDE_DIRS})
${Eigen3_INCLUDE_DIR})
endif()
set(COMPONENT_LIBS RobotAPIUnits RobotAPICore RobotAPIInterfaces ArmarXInterfaces ArmarXCore ArmarXCoreObservers RobotAPIRemoteRobot
${Simox_LIBRARIES})
if (NOT Simox_FOUND)
find_package(Simox 2.3.0 QUIET)
endif()
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
include_directories(${Simox_INCLUDE_DIRS})
set(COMPONENT_LIBS RobotAPIUnits)
set(SOURCES main.cpp HeadIKUnitApp.h)
......
source/RobotAPI/applications/HeadIKUnit/HeadIKUnitApp.h
+ 2
− 2
View file @ f48722a8
......@@ -28,8 +28,8 @@
namespace armarx
{
class HeadIKUnitApp :
virtual public armarx::Application
{
virtual public armarx::Application
{
void setup(const ManagedIceObjectRegistryInterfacePtr& registry, Ice::PropertiesPtr properties)
{
registry->addObject( Component::create<HeadIKUnit>(properties) );
......
source/RobotAPI/applications/HeadIKUnit/main.cpp
+ 0
− 1
View file @ f48722a8
......@@ -22,7 +22,6 @@
*/
#include "HeadIKUnitApp.h"
#include <Core/core/logging/Logging.h>
int main(int argc, char* argv[])
{
......
source/RobotAPI/applications/KinematicUnitObserver/CMakeLists.txt
+ 1
− 6
View file @ f48722a8
armarx_component_set_name(KinematicUnitObserver)
find_package(Simox 2.3.0 QUIET)
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
set(COMPONENT_LIBS ArmarXInterfaces ArmarXCore #ArmarXCoreUnits
RobotAPIUnits
ArmarXCoreObservers)
set(COMPONENT_LIBS RobotAPIUnits)
set(SOURCES main.cpp KinematicUnitObserverApp.h)
......
source/RobotAPI/applications/KinematicUnitSimulation/CMakeLists.txt
+ 8
− 7
View file @ f48722a8
......@@ -4,16 +4,17 @@ armarx_component_set_name(KinematicUnitSimulation)
find_package(Eigen3 QUIET)
armarx_build_if(Eigen3_FOUND "Eigen3 not available")
find_package(Simox 2.3.0 QUIET)
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
if (Eigen3_FOUND)
include_directories(${Eigen3_INCLUDE_DIR})
endif()
include_directories(${Eigen3_INCLUDE_DIR})
if (NOT Simox_FOUND)
find_package(Simox 2.3.0 QUIET)
endif()
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
include_directories(${Simox_INCLUDE_DIRS})
set(COMPONENT_LIBS ArmarXInterfaces ArmarXCore #ArmarXCoreUnits
RobotAPIUnits
${Simox_LIBRARIES})
set(COMPONENT_LIBS RobotAPIUnits)
set(SOURCES main.cpp KinematicUnitSimulationApp.h)
......
source/RobotAPI/applications/MotionControlTest/CMakeLists.txt
+ 3
− 7
View file @ f48722a8
......@@ -4,16 +4,12 @@ armarx_component_set_name(MotionControlTest)
find_package(Eigen3 QUIET)
armarx_build_if(Eigen3_FOUND "Eigen3 not available")
find_package(Simox QUIET)
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
if (Eigen3_FOUND AND Simox_FOUND)
if (Eigen3_FOUND)
include_directories(
${Eigen3_INCLUDE_DIR}
${Simox_INCLUDE_DIRS})
${Eigen3_INCLUDE_DIR})
endif()
set(COMPONENT_LIBS MotionControl RobotAPICore ArmarXInterfaces ArmarXCore ArmarXCoreObservers RobotAPIRobotStateComponent ArmarXCoreStatechart RobotAPIOperations ${Simox_LIBRARIES})
set(COMPONENT_LIBS MotionControl)
set(SOURCES main.cpp MotionControlTestApp.h)
......
source/RobotAPI/applications/MotionControlTest/MotionControlTestApp.h
+ 2
− 2
View file @ f48722a8
......@@ -28,8 +28,8 @@
namespace armarx
{
class MotionControlTestApp :
virtual public armarx::Application
{
virtual public armarx::Application
{
void setup(const ManagedIceObjectRegistryInterfacePtr& registry, Ice::PropertiesPtr properties)
{
registry->addObject( Component::create<MotionControl::MotionControlOfferer>(properties) );
......
source/RobotAPI/applications/MovePlatform/CMakeLists.txt
+ 10
− 18
View file @ f48722a8
......@@ -3,26 +3,18 @@
armarx_component_set_name(MovePlatformApp)
find_package(Eigen3 QUIET)
find_package(Simox QUIET)
armarx_build_if(Eigen3_FOUND "Eigen3 not available")
armarx_build_if(Simox_FOUND "Simox not available")
#armarx_build_if(MemoryX_FOUND "VisionX not available")
include_directories(${Eigen3_INCLUDE_DIR} ${Simox_INCLUDE_DIRS})
set(COMPONENT_LIBS
MovePlatform
ArmarXInterfaces
ArmarXCore
ArmarXCoreStatechart
ArmarXCoreObservers
RobotAPIOperations
RobotAPIRemoteRobot
#MemoryXInterfaces
#MemoryXCore
#MemoryXMemoryTypes
${Simox_LIBRARIES})
include_directories(${Eigen3_INCLUDE_DIR})
if (NOT Simox_FOUND)
find_package(Simox 2.3.0 QUIET)
endif()
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
include_directories(${Simox_INCLUDE_DIRS})
set(COMPONENT_LIBS MovePlatform)
set(SOURCES main.cpp
MovePlatformApp.h)
......
source/RobotAPI/applications/MovePlatformToLandmark/CMakeLists.txt
+ 10
− 19
View file @ f48722a8
......@@ -3,27 +3,18 @@
armarx_component_set_name(MovePlatformToLandmarkApp)
find_package(Eigen3 QUIET)
find_package(Simox QUIET)
armarx_build_if(Eigen3_FOUND "Eigen3 not available")
armarx_build_if(Simox_FOUND "Simox not available")
#armarx_build_if(MemoryX_FOUND "VisionX not available")
include_directories(${Eigen3_INCLUDE_DIR} ${Simox_INCLUDE_DIRS})
set(COMPONENT_LIBS
#MovePlatform
MovePlatformToLandmark
ArmarXInterfaces
ArmarXCore
ArmarXCoreStatechart
ArmarXCoreObservers
RobotAPIOperations
RobotAPIRemoteRobot
#MemoryXInterfaces
#MemoryXCore
#MemoryXMemoryTypes
${Simox_LIBRARIES})
include_directories(${Eigen3_INCLUDE_DIR})
if (NOT Simox_FOUND)
find_package(Simox 2.3.0 QUIET)
endif()
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
include_directories(${Simox_INCLUDE_DIRS})
set(COMPONENT_LIBS MovePlatformToLandmark)
set(SOURCES main.cpp
MovePlatformToLandmarkApp.h)
......
source/RobotAPI/applications/PlatformUnitObserver/CMakeLists.txt
+ 1
− 7
View file @ f48722a8
armarx_component_set_name(PlatformUnitObserver)
find_package(Simox QUIET)
armarx_build_if(Simox_FOUND "Simox VirtualRobot not found")
set(COMPONENT_LIBS ArmarXInterfaces ArmarXCore ArmarXCoreObservers #ArmarXCoreUnits
RobotAPIUnits
${Simox_LIBRARIES})
set(COMPONENT_LIBS RobotAPIUnits)
set(SOURCES main.cpp PlatformUnitObserverApp.h)
......
source/RobotAPI/applications/PlatformUnitSimulation/CMakeLists.txt
+ 1
− 6
View file @ f48722a8
armarx_component_set_name(PlatformUnitSimulation)
find_package(Simox QUIET)
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
set(COMPONENT_LIBS ArmarXInterfaces ArmarXCore #ArmarXCoreUnits
RobotAPIUnits)
set(COMPONENT_LIBS RobotAPIUnits)
set(SOURCES main.cpp PlatformUnitSimulationApp.h)
......
source/RobotAPI/applications/RobotControl/CMakeLists.txt
+ 1
− 5
View file @ f48722a8
armarx_component_set_name(RobotControl)
#find_package(Simox QUIET)
#armarx_build_if(Simox_FOUND 2.3.0 "Simox-VirtualRobot not available")
set(COMPONENT_LIBS ArmarXInterfaces ArmarXCore ArmarXCoreObservers RobotAPIInterfaces RobotAPIRobotStateComponent ArmarXCoreStatechart RobotAPIOperations RobotAPIUnits RobotAPIRemoteRobot)
set(COMPONENT_LIBS RobotAPIOperations)
set(SOURCES main.cpp RobotControlApp.h)
......
source/RobotAPI/applications/RobotControlUI/CMakeLists.txt
+ 1
− 7
View file @ f48722a8
armarx_component_set_name(RobotControlUI)
# Removed dependency on Simox 2014-08-04
#find_package(Simox 2.3.0 QUIET)
#armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
set(COMPONENT_LIBS ArmarXInterfaces ArmarXCore #ArmarXCoreUnits
ArmarXCoreObservers ArmarXCoreStatechart RobotAPIOperations)
set(COMPONENT_LIBS RobotAPIOperations)
set(SOURCES main.cpp
RobotControlUI.cpp
......
source/RobotAPI/applications/RobotStateComponent/CMakeLists.txt
+ 1
− 7
View file @ f48722a8
......@@ -4,15 +4,9 @@ armarx_component_set_name(RobotStateComponent)
find_package(Eigen3 QUIET)
armarx_build_if(Eigen3_FOUND "component disabled")
find_package(Simox 2.3.0 QUIET)
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
include_directories(${Eigen3_INCLUDE_DIR})
include_directories(${Simox_INCLUDE_DIRS})
set(COMPONENT_LIBS ArmarXInterfaces ArmarXCore RobotAPIUnits RobotAPIInterfaces #ArmarXCoreUnits
RobotAPIRobotStateComponent)
set(COMPONENT_LIBS RobotAPIRobotStateComponent)
set(SOURCES main.cpp RobotStateComponentApp.h)
......
source/RobotAPI/applications/RobotStateObserver/CMakeLists.txt
+ 1
− 5
View file @ f48722a8
......@@ -3,14 +3,10 @@ armarx_component_set_name(RobotStateObserver)
find_package(Eigen3 QUIET)
armarx_build_if(Eigen3_FOUND "component disabled")
find_package(Simox 2.3.0 QUIET)
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
include_directories(${Eigen3_INCLUDE_DIR})
include_directories(${Simox_INCLUDE_DIRS})
set(COMPONENT_LIBS ArmarXInterfaces ArmarXCore RobotAPIInterfaces RobotAPIUnits #ArmarXCoreUnits
ArmarXCoreObservers RobotAPIRemoteRobot)
set(COMPONENT_LIBS RobotAPIRemoteRobot)
set(SOURCES main.cpp RobotStateObserverApp.h)
......
source/RobotAPI/applications/TCPControlUnit/CMakeLists.txt
+ 9
− 8
View file @ f48722a8
......@@ -4,17 +4,18 @@ armarx_component_set_name(TCPControlUnit)
find_package(Eigen3 QUIET)
armarx_build_if(Eigen3_FOUND "Eigen3 not available")
find_package(Simox QUIET)
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
if (Eigen3_FOUND AND Simox_FOUND)
if (Eigen3_FOUND)
include_directories(
${Eigen3_INCLUDE_DIR}
${Simox_INCLUDE_DIRS})
${Eigen3_INCLUDE_DIR})
endif()
set(COMPONENT_LIBS RobotAPIUnits RobotAPICore RobotAPIInterfaces ArmarXInterfaces ArmarXCore ArmarXCoreObservers RobotAPIRemoteRobot
${Simox_LIBRARIES})
if (NOT Simox_FOUND)
find_package(Simox 2.3.0 QUIET)
endif()
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
include_directories(${Simox_INCLUDE_DIRS})
set(COMPONENT_LIBS RobotAPIUnits)
set(SOURCES main.cpp TCPControlUnitApp.h)
......
source/RobotAPI/applications/TCPMoverUnit/CMakeLists.txt
+ 12
− 6
View file @ f48722a8
armarx_component_set_name(TCPMoverUnit)
find_package(Simox 2.3.0 QUIET)
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
find_package(Eigen3 QUIET)
armarx_build_if(Eigen3_FOUND "Eigen3 not available")
if (Eigen3_FOUND)
include_directories(
${Eigen3_INCLUDE_DIR})
endif()
include_directories(${Eigen3_INCLUDE_DIR})
if (NOT Simox_FOUND)
find_package(Simox 2.3.0 QUIET)
endif()
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
include_directories(${Simox_INCLUDE_DIRS})
set(COMPONENT_LIBS ArmarXInterfaces ArmarXCore #ArmarXCoreUnits
RobotAPIInterfaces RobotAPIUnits
${Simox_LIBRARIES})
set(COMPONENT_LIBS RobotAPIUnits)
set(SOURCES main.cpp TCPMoverUnitApp.h)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment