From b03110cf9fdfc0f785bdb7495a99d62c2eed1fbf Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Wed, 29 Nov 2023 15:49:26 +0100
Subject: [PATCH] Fix build
---
.../armem/client/MemoryToDebugObserver/CMakeLists.txt | 4 ++--
.../armem/client/MemoryToDebugObserver/Component.cpp | 4 ++--
.../components/armem/client/MemoryToDebugObserver/Component.h | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/source/RobotAPI/components/armem/client/MemoryToDebugObserver/CMakeLists.txt b/source/RobotAPI/components/armem/client/MemoryToDebugObserver/CMakeLists.txt
index 77aeec993..797cb6b47 100644
--- a/source/RobotAPI/components/armem/client/MemoryToDebugObserver/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/client/MemoryToDebugObserver/CMakeLists.txt
@@ -18,11 +18,11 @@ set(HEADERS
armarx_add_component("${SOURCES}" "${HEADERS}")
-set(COMPONENT_INCLUDE RobotAPI/components/armem/client/MemoryToDebugObserver/Component.h)
-
armarx_generate_and_add_component_executable(
COMPONENT_INCLUDE
"${CMAKE_CURRENT_LIST_DIR}/Component.h"
+ COMPONENT_NAMESPACE
+ armarx::memory_to_debug_observer
COMPONENT_CLASS_NAME
Component
)
diff --git a/source/RobotAPI/components/armem/client/MemoryToDebugObserver/Component.cpp b/source/RobotAPI/components/armem/client/MemoryToDebugObserver/Component.cpp
index 6f7e64012..70e1acea7 100644
--- a/source/RobotAPI/components/armem/client/MemoryToDebugObserver/Component.cpp
+++ b/source/RobotAPI/components/armem/client/MemoryToDebugObserver/Component.cpp
@@ -30,7 +30,7 @@
#include <RobotAPI/libraries/aron/core/data/variant/primitive/All.h>
#include <RobotAPI/libraries/aron/core/data/visitor/variant/VariantVisitor.h>
-namespace armarx
+namespace armarx::memory_to_debug_observer
{
armarx::PropertyDefinitionsPtr
@@ -288,4 +288,4 @@ namespace armarx
}
}
-} // namespace armarx
+} // namespace armarx::memory_to_debug_observer
diff --git a/source/RobotAPI/components/armem/client/MemoryToDebugObserver/Component.h b/source/RobotAPI/components/armem/client/MemoryToDebugObserver/Component.h
index dc22c02da..ad76e6c9b 100644
--- a/source/RobotAPI/components/armem/client/MemoryToDebugObserver/Component.h
+++ b/source/RobotAPI/components/armem/client/MemoryToDebugObserver/Component.h
@@ -34,7 +34,7 @@
#include <RobotAPI/libraries/armem/client/plugins/PluginUser.h>
#include <RobotAPI/libraries/armem/core/wm/memory_definitions.h>
-namespace armarx
+namespace armarx::memory_to_debug_observer
{
@@ -113,4 +113,4 @@ namespace armarx
RemoteGuiTab tab;
};
-} // namespace armarx
+} // namespace armarx::memory_to_debug_observer
--
GitLab