From 7e11d989e0fff49a0d11ade1f7e5e4555c15e470 Mon Sep 17 00:00:00 2001
From: Manfred Kroehnert <Manfred.Kroehnert@kit.edu>
Date: Wed, 19 Feb 2014 11:42:07 +0100
Subject: [PATCH] cmake: replace deprecated armarc_component_add_executable()
with armarx_add_component_executable()
---
.../applications/ForceTorqueObserver/CMakeLists.txt | 6 ++----
source/RobotAPI/applications/MotionControl/CMakeLists.txt | 6 ++----
.../RobotAPI/applications/MotionControlTest/CMakeLists.txt | 6 ++----
source/RobotAPI/applications/TCPControlUnit/CMakeLists.txt | 6 ++----
4 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/source/RobotAPI/applications/ForceTorqueObserver/CMakeLists.txt b/source/RobotAPI/applications/ForceTorqueObserver/CMakeLists.txt
index 3a0253131..07d5eedc2 100755
--- a/source/RobotAPI/applications/ForceTorqueObserver/CMakeLists.txt
+++ b/source/RobotAPI/applications/ForceTorqueObserver/CMakeLists.txt
@@ -20,9 +20,7 @@ armarx_build_if(ArmarXCoreObservers_ENABLED "ArmarXCoreObservers library disable
if (ARMARX_BUILD)
set(COMPONENT_LIBS RobotAPIUnits RobotAPICore RobotAPIInterfaces ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreRemoteRobot)
- set(SOURCES "")
- set(HEADERS ForceTorqueObserverApp.h)
-
- armarx_component_add_executable("${SOURCES}" "${HEADERS}")
+ set(SOURCES ForceTorqueObserverApp.h)
+ armarx_add_component_executable("${SOURCES}")
endif()
diff --git a/source/RobotAPI/applications/MotionControl/CMakeLists.txt b/source/RobotAPI/applications/MotionControl/CMakeLists.txt
index ea23a4dc5..fc628f1e4 100755
--- a/source/RobotAPI/applications/MotionControl/CMakeLists.txt
+++ b/source/RobotAPI/applications/MotionControl/CMakeLists.txt
@@ -20,9 +20,7 @@ armarx_build_if(ArmarXCoreObservers_ENABLED "ArmarXCoreObservers library disable
if (ARMARX_BUILD)
set(COMPONENT_LIBS MotionControl RobotAPICore ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreRobotStateComponent ArmarXCoreStatechart ArmarXCoreOperations)
- set(SOURCES "")
- set(HEADERS MotionControlApp.h)
-
- armarx_component_add_executable("${SOURCES}" "${HEADERS}")
+ set(SOURCES MotionControlApp.h)
+ armarx_add_component_executable("${SOURCES}")
endif()
diff --git a/source/RobotAPI/applications/MotionControlTest/CMakeLists.txt b/source/RobotAPI/applications/MotionControlTest/CMakeLists.txt
index b60a8768f..54cdd8903 100644
--- a/source/RobotAPI/applications/MotionControlTest/CMakeLists.txt
+++ b/source/RobotAPI/applications/MotionControlTest/CMakeLists.txt
@@ -22,9 +22,7 @@ if (ARMARX_BUILD)
include_directories(${Simox_INCLUDE_DIRS})
set(COMPONENT_LIBS MotionControl RobotAPICore ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreRobotStateComponent ArmarXCoreStatechart ArmarXCoreOperations ${Simox_LIBRARIES})
- set(SOURCES "")
- set(HEADERS MotionControlTestApp.h)
-
- armarx_component_add_executable("${SOURCES}" "${HEADERS}")
+ set(SOURCES MotionControlTestApp.h)
+ armarx_add_component_executable("${SOURCES}")
endif()
diff --git a/source/RobotAPI/applications/TCPControlUnit/CMakeLists.txt b/source/RobotAPI/applications/TCPControlUnit/CMakeLists.txt
index 95497c394..1a1a725f4 100755
--- a/source/RobotAPI/applications/TCPControlUnit/CMakeLists.txt
+++ b/source/RobotAPI/applications/TCPControlUnit/CMakeLists.txt
@@ -22,9 +22,7 @@ if (ARMARX_BUILD)
include_directories(${Simox_INCLUDE_DIRS})
set(COMPONENT_LIBS RobotAPIUnits RobotAPICore RobotAPIInterfaces ArmarXInterfaces ArmarXCore ArmarXCoreObservers ArmarXCoreRemoteRobot ${Simox_LIBRARIES})
- set(SOURCES "")
- set(HEADERS TCPControlUnitApp.h)
-
- armarx_component_add_executable("${SOURCES}" "${HEADERS}")
+ set(SOURCES TCPControlUnitApp.h)
+ armarx_add_component_executable("${SOURCES}")
endif()
--
GitLab