From 62e34d01fae10ffc3095af916a787c46fce151f9 Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Wed, 27 Mar 2024 17:45:44 +0100
Subject: [PATCH] hotfix: CMake
---
source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt | 2 +-
source/RobotAPI/libraries/armem_laser_scans/CMakeLists.txt | 1 +
source/RobotAPI/libraries/armem_robot_state/CMakeLists.txt | 2 +-
.../RobotAPI/libraries/armem_robot_state/aron_conversions.cpp | 4 ----
.../libraries/armem_robot_state/server/CMakeLists.txt | 2 ++
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt b/source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt
index c1786b00a..59576d4fb 100644
--- a/source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt
+++ b/source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt
@@ -16,7 +16,7 @@ set(LIBS
Eigen3::Eigen
${manif_LIBRARIES}
- #armem_robot_state_aron
+ armem_robot_state
)
set(LIB_FILES
diff --git a/source/RobotAPI/libraries/armem_laser_scans/CMakeLists.txt b/source/RobotAPI/libraries/armem_laser_scans/CMakeLists.txt
index 92b768982..5f6098533 100644
--- a/source/RobotAPI/libraries/armem_laser_scans/CMakeLists.txt
+++ b/source/RobotAPI/libraries/armem_laser_scans/CMakeLists.txt
@@ -13,6 +13,7 @@ armarx_add_library(
aroncommon
aronvectorconverter
armem_robot_state
+ ArViz
# System / External
Eigen3::Eigen
HEADERS
diff --git a/source/RobotAPI/libraries/armem_robot_state/CMakeLists.txt b/source/RobotAPI/libraries/armem_robot_state/CMakeLists.txt
index 21c808d63..25aa47c76 100644
--- a/source/RobotAPI/libraries/armem_robot_state/CMakeLists.txt
+++ b/source/RobotAPI/libraries/armem_robot_state/CMakeLists.txt
@@ -20,7 +20,7 @@ armarx_add_library(
RobotAPI::armem
RobotUnitDataStreamingReceiver
# RobotAPI::ArViz
- RobotAPI::ComponentPlugins
+ # RobotAPI::ComponentPlugins
# RobotAPI::Core
aroncommon
# armem_objects
diff --git a/source/RobotAPI/libraries/armem_robot_state/aron_conversions.cpp b/source/RobotAPI/libraries/armem_robot_state/aron_conversions.cpp
index d7bdaa271..e00b27c3d 100644
--- a/source/RobotAPI/libraries/armem_robot_state/aron_conversions.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/aron_conversions.cpp
@@ -1,11 +1,7 @@
#include "aron_conversions.h"
-#include <string>
-
#include <ArmarXCore/core/logging/Logging.h>
-#include <RobotAPI/libraries/ArmarXObjects/ObjectID.h>
-#include <RobotAPI/libraries/ArmarXObjects/aron_conversions.h>
#include <RobotAPI/libraries/armem_robot_state/aron/Exteroception.aron.generated.h>
#include <RobotAPI/libraries/armem_robot_state/aron/Proprioception.aron.generated.h>
#include <RobotAPI/libraries/armem_robot_state/aron/Transform.aron.generated.h>
diff --git a/source/RobotAPI/libraries/armem_robot_state/server/CMakeLists.txt b/source/RobotAPI/libraries/armem_robot_state/server/CMakeLists.txt
index 7525e9bfd..bfd08725c 100644
--- a/source/RobotAPI/libraries/armem_robot_state/server/CMakeLists.txt
+++ b/source/RobotAPI/libraries/armem_robot_state/server/CMakeLists.txt
@@ -21,6 +21,8 @@ armarx_add_library(
RobotAPICore
RobotAPIInterfaces
RobotStatechartHelpers
+ RobotAPI::ComponentPlugins
+ ArViz
RobotAPI::armem_server
RobotAPI::armem_robot_state
aroncommon
--
GitLab