From 587ce36a26139af0c413ff9fed7af76dcdeeebcb Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Thu, 16 Nov 2023 10:28:54 +0100
Subject: [PATCH] Refactor includes, cmake
---
.../libraries/aron/common/CMakeLists.txt | 21 +++++++++----------
.../libraries/aron/common/aron_conversions.h | 11 +++++++---
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/source/RobotAPI/libraries/aron/common/CMakeLists.txt b/source/RobotAPI/libraries/aron/common/CMakeLists.txt
index e66e96ef9..011f3d196 100644
--- a/source/RobotAPI/libraries/aron/common/CMakeLists.txt
+++ b/source/RobotAPI/libraries/aron/common/CMakeLists.txt
@@ -18,15 +18,15 @@ armarx_add_library(
forward_declarations.h
json_conversions.h
+ aron_conversions/armarx.h
aron_conversions/core.h
- aron_conversions/stl.h
- aron_conversions/packagepath.h
+ aron_conversions/eigen.h
aron_conversions/framed.h
aron_conversions/names.h
- aron_conversions/time.h
- aron_conversions/armarx.h
+ aron_conversions/packagepath.h
aron_conversions/simox.h
- aron_conversions/eigen.h
+ aron_conversions/stl.h
+ aron_conversions/time.h
json_conversions/armarx.h
json_conversions/framed.h
@@ -38,16 +38,15 @@ armarx_add_library(
util/object_finders.h
SOURCES
-
+ aron_conversions/armarx.cpp
aron_conversions/core.cpp
- aron_conversions/stl.cpp
- aron_conversions/packagepath.cpp
+ aron_conversions/eigen.cpp
aron_conversions/framed.cpp
aron_conversions/names.cpp
- aron_conversions/time.cpp
- aron_conversions/armarx.cpp
+ aron_conversions/packagepath.cpp
aron_conversions/simox.cpp
- aron_conversions/eigen.cpp
+ aron_conversions/stl.cpp
+ aron_conversions/time.cpp
json_conversions/armarx.cpp
json_conversions/framed.cpp
diff --git a/source/RobotAPI/libraries/aron/common/aron_conversions.h b/source/RobotAPI/libraries/aron/common/aron_conversions.h
index 95177ce57..c753c3c96 100644
--- a/source/RobotAPI/libraries/aron/common/aron_conversions.h
+++ b/source/RobotAPI/libraries/aron/common/aron_conversions.h
@@ -1,6 +1,11 @@
#pragma once
+#include <RobotAPI/libraries/aron/common/aron_conversions/armarx.h>
+#include <RobotAPI/libraries/aron/common/aron_conversions/eigen.h>
+#include <RobotAPI/libraries/aron/common/aron_conversions/framed.h>
+#include <RobotAPI/libraries/aron/common/aron_conversions/names.h>
+#include <RobotAPI/libraries/aron/common/aron_conversions/packagepath.h>
+#include <RobotAPI/libraries/aron/common/aron_conversions/simox.h>
+#include <RobotAPI/libraries/aron/common/aron_conversions/stl.h>
+#include <RobotAPI/libraries/aron/common/aron_conversions/time.h>
#include <RobotAPI/libraries/aron/core/aron_conversions.h>
-#include "aron_conversions/armarx.h"
-#include "aron_conversions/simox.h"
-#include "aron_conversions/eigen.h"
--
GitLab