From 61c8f60b93cf8e6a8ef4e4f0dc8898ed0da1a1b3 Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Sun, 21 Nov 2021 14:03:21 +0100
Subject: [PATCH] fixing dependency issue: moving location/aron/Location.xml to
 core library

---
 .../components/GraphImportExport/GraphImportExport.cpp    | 2 +-
 .../components/NavigationMemory/NavigationMemory.cpp      | 2 +-
 .../navigation/components/NavigationMemory/Visu.cpp       | 2 +-
 source/armarx/navigation/core/CMakeLists.txt              | 1 +
 source/armarx/navigation/core/Graph.cpp                   | 2 +-
 .../navigation/{location => core}/aron/Location.xml       | 0
 .../gui-plugins/LocationGraphEditor/WidgetController.cpp  | 2 +-
 .../gui-plugins/LocationGraphEditor/WidgetController.h    | 2 +-
 source/armarx/navigation/location/CMakeLists.txt          | 8 --------
 source/armarx/navigation/memory/client/graph/Reader.cpp   | 2 +-
 source/armarx/navigation/memory/client/graph/Reader.h     | 2 +-
 11 files changed, 9 insertions(+), 16 deletions(-)
 rename source/armarx/navigation/{location => core}/aron/Location.xml (100%)

diff --git a/source/armarx/navigation/components/GraphImportExport/GraphImportExport.cpp b/source/armarx/navigation/components/GraphImportExport/GraphImportExport.cpp
index 27ea3f15..e10c6e3f 100644
--- a/source/armarx/navigation/components/GraphImportExport/GraphImportExport.cpp
+++ b/source/armarx/navigation/components/GraphImportExport/GraphImportExport.cpp
@@ -39,7 +39,7 @@
 #include <armarx/navigation/core/aron/Graph.aron.generated.h>
 #include <armarx/navigation/graph/Visu.h>
 #include <armarx/navigation/graph/constants.h>
-#include <armarx/navigation/location/aron/Location.aron.generated.h>
+#include <armarx/navigation/core/aron/Location.aron.generated.h>
 #include <armarx/navigation/location/constants.h>
 
 
diff --git a/source/armarx/navigation/components/NavigationMemory/NavigationMemory.cpp b/source/armarx/navigation/components/NavigationMemory/NavigationMemory.cpp
index 11b8271d..292b497c 100644
--- a/source/armarx/navigation/components/NavigationMemory/NavigationMemory.cpp
+++ b/source/armarx/navigation/components/NavigationMemory/NavigationMemory.cpp
@@ -39,7 +39,7 @@
 #include <armarx/navigation/core/aron/Trajectory.aron.generated.h>
 #include <armarx/navigation/core/aron/Twist.aron.generated.h>
 #include <armarx/navigation/graph/constants.h>
-#include <armarx/navigation/location/aron/Location.aron.generated.h>
+#include <armarx/navigation/core/aron/Location.aron.generated.h>
 #include <armarx/navigation/location/constants.h>
 
 
diff --git a/source/armarx/navigation/components/NavigationMemory/Visu.cpp b/source/armarx/navigation/components/NavigationMemory/Visu.cpp
index 63307c10..328e21ce 100644
--- a/source/armarx/navigation/components/NavigationMemory/Visu.cpp
+++ b/source/armarx/navigation/components/NavigationMemory/Visu.cpp
@@ -27,7 +27,7 @@
 #include <armarx/navigation/core/Graph.h>
 #include <armarx/navigation/core/aron/Graph.aron.generated.h>
 #include <armarx/navigation/graph/Visu.h>
-#include <armarx/navigation/location/aron/Location.aron.generated.h>
+#include <armarx/navigation/core/aron/Location.aron.generated.h>
 
 
 namespace armarx::navigation::memory
diff --git a/source/armarx/navigation/core/CMakeLists.txt b/source/armarx/navigation/core/CMakeLists.txt
index d4eb4883..ec1598c6 100644
--- a/source/armarx/navigation/core/CMakeLists.txt
+++ b/source/armarx/navigation/core/CMakeLists.txt
@@ -6,6 +6,7 @@ armarx_add_aron_library(core_aron
         aron/Trajectory.xml
         aron/Events.xml
         aron/Graph.xml
+        aron/Location.xml
 )
 
 armarx_add_library(core
diff --git a/source/armarx/navigation/core/Graph.cpp b/source/armarx/navigation/core/Graph.cpp
index 7bdd89ba..f1bc3781 100644
--- a/source/armarx/navigation/core/Graph.cpp
+++ b/source/armarx/navigation/core/Graph.cpp
@@ -30,7 +30,7 @@
 
 #include <RobotAPI/libraries/armem/core/wm/memory_definitions.h>
 
-#include <armarx/navigation/location/aron/Location.aron.generated.h>
+#include <armarx/navigation/core/aron/Location.aron.generated.h>
 #include <armarx/navigation/core/json_conversions.h>
 
 
diff --git a/source/armarx/navigation/location/aron/Location.xml b/source/armarx/navigation/core/aron/Location.xml
similarity index 100%
rename from source/armarx/navigation/location/aron/Location.xml
rename to source/armarx/navigation/core/aron/Location.xml
diff --git a/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.cpp b/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.cpp
index e29849d8..b4487009 100644
--- a/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.cpp
+++ b/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.cpp
@@ -43,7 +43,7 @@
 #include <armarx/navigation/core/aron/Graph.aron.generated.h>
 #include <armarx/navigation/graph/constants.h>
 #include <armarx/navigation/gui-plugins/LocationGraphEditor/ui_LocationGraphEditorWidget.h>
-#include <armarx/navigation/location/aron/Location.aron.generated.h>
+#include <armarx/navigation/core/aron/Location.aron.generated.h>
 #include <armarx/navigation/location/constants.h>
 
 // Qt headers
diff --git a/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.h b/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.h
index 8fb16d47..4e06004d 100644
--- a/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.h
+++ b/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.h
@@ -41,7 +41,7 @@
 #include "widgets/graph_scene.h"
 #include <armarx/navigation/core/Graph.h>
 #include <armarx/navigation/gui-plugins/LocationGraphEditor/ui_LocationGraphEditorWidget.h>
-#include <armarx/navigation/location/aron/Location.aron.generated.h>
+#include <armarx/navigation/core/aron/Location.aron.generated.h>
 
 
 class QDialog;
diff --git a/source/armarx/navigation/location/CMakeLists.txt b/source/armarx/navigation/location/CMakeLists.txt
index 45c89d57..21db0db7 100644
--- a/source/armarx/navigation/location/CMakeLists.txt
+++ b/source/armarx/navigation/location/CMakeLists.txt
@@ -1,11 +1,3 @@
-
-
-armarx_add_aron_library(location_aron
-    ARON_FILES
-        aron/Location.xml
-)
-
-
 armarx_add_library(location
     DEPENDENCIES
         ArmarXCoreInterfaces
diff --git a/source/armarx/navigation/memory/client/graph/Reader.cpp b/source/armarx/navigation/memory/client/graph/Reader.cpp
index 284bf74c..7d3513a1 100644
--- a/source/armarx/navigation/memory/client/graph/Reader.cpp
+++ b/source/armarx/navigation/memory/client/graph/Reader.cpp
@@ -15,7 +15,7 @@
 #include <armarx/navigation/core/Graph.h>
 #include <armarx/navigation/core/aron/Graph.aron.generated.h>
 #include <armarx/navigation/graph/constants.h>
-#include <armarx/navigation/location/aron/Location.aron.generated.h>
+#include <armarx/navigation/core/aron/Location.aron.generated.h>
 #include <armarx/navigation/location/constants.h>
 
 namespace armarx::navigation::mem::client::graph
diff --git a/source/armarx/navigation/memory/client/graph/Reader.h b/source/armarx/navigation/memory/client/graph/Reader.h
index d9181e26..9a65ed9f 100644
--- a/source/armarx/navigation/memory/client/graph/Reader.h
+++ b/source/armarx/navigation/memory/client/graph/Reader.h
@@ -25,7 +25,7 @@
 
 #include <armarx/navigation/core/Graph.h>
 #include <armarx/navigation/core/types.h>
-#include <armarx/navigation/location/aron/Location.aron.generated.h>
+#include <armarx/navigation/core/aron/Location.aron.generated.h>
 
 namespace armarx::navigation::mem::client::graph
 {
-- 
GitLab