From 80e80dfbe4109a365e53c15c8e87cf07b56df643 Mon Sep 17 00:00:00 2001
From: Raphael Grimm <raphael.grimm@kit.edu>
Date: Wed, 14 Feb 2018 22:17:33 +0100
Subject: [PATCH] Cleanup cmake
---
CMakeLists.txt | 2 +-
.../RemoteRobotTestProject/CMakeLists.txt | 9 ++++++++-
.../RobotAPI/components/ViewSelection/CMakeLists.txt | 10 ++--------
source/RobotAPI/components/units/CMakeLists.txt | 3 ++-
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d609644ec..5ae7be96a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ else()
find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
endif()
if (Simox_FOUND)
- setupSimoxExternalLibraries()
+ setupSimoxExternalLibraries()
if(ARMARX_USE_QT5)
if(Simox_USE_QT4)
message(FATAL_ERROR "ArmarX uses Qt5 and Simox uses Qt4")
diff --git a/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/CMakeLists.txt b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/CMakeLists.txt
index c525b7e84..ed0078128 100644
--- a/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/CMakeLists.txt
+++ b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/CMakeLists.txt
@@ -44,7 +44,14 @@ if (ARMARX_BUILD)
include_directories(SYSTEM ${Eigen3_INCLUDE_DIR})
include_directories(${Simox_INCLUDE_DIR})
- set(COMPONENT_LIBS RemoteRobotTestProjectInterfaces ArmarXInterfaces ArmarXCoreRemoteRobot ArmarXCore ${Simox_LIBRARIES} ${Coin3D_LIBRARIES})
+ set(COMPONENT_LIBS
+ RemoteRobotTestProjectInterfaces
+ ArmarXInterfaces
+ ArmarXCoreRemoteRobot
+ ArmarXCore
+ ${Simox_LIBRARIES}
+ ${Coin3D_LIBRARIES}
+ )
set(SOURCES RemoteRobotTestProject.cpp
RemoteRobotTestProject.h
diff --git a/source/RobotAPI/components/ViewSelection/CMakeLists.txt b/source/RobotAPI/components/ViewSelection/CMakeLists.txt
index a8cbae650..ba3a6b8df 100644
--- a/source/RobotAPI/components/ViewSelection/CMakeLists.txt
+++ b/source/RobotAPI/components/ViewSelection/CMakeLists.txt
@@ -14,14 +14,8 @@ set(COMPONENT_LIBS
${Simox_LIBRARIES}
)
-set(SOURCES
-./ViewSelection.cpp
-#@TEMPLATE_LINE@@COMPONENT_PATH@/@COMPONENT_NAME@.cpp
-)
-set(HEADERS
-./ViewSelection.h
-#@TEMPLATE_LINE@@COMPONENT_PATH@/@COMPONENT_NAME@.h
-)
+set(SOURCES ViewSelection.cpp)
+set(HEADERS ViewSelection.h)
armarx_add_component("${SOURCES}" "${HEADERS}")
diff --git a/source/RobotAPI/components/units/CMakeLists.txt b/source/RobotAPI/components/units/CMakeLists.txt
index 5830dcf7e..6652dae03 100644
--- a/source/RobotAPI/components/units/CMakeLists.txt
+++ b/source/RobotAPI/components/units/CMakeLists.txt
@@ -17,7 +17,8 @@ set(LIBS
RobotAPICore
ArmarXCoreObservers
ArmarXCoreEigen3Variants
- ${Simox_LIBRARIES})
+ ${Simox_LIBRARIES}
+)
set(LIB_HEADERS
ForceTorqueObserver.h
--
GitLab