From 87e620b5513b912cb028f41ad9a6ddb6954321ad Mon Sep 17 00:00:00 2001 From: Fabian Reister <fabian.reister@kit.edu> Date: Tue, 31 May 2022 09:00:37 +0200 Subject: [PATCH 1/2] moving example component --- .../components/example_client/CMakeLists.txt | 0 .../components/example_client/Component.cpp | 0 .../navigation => examples}/components/example_client/Component.h | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {source/armarx/navigation => examples}/components/example_client/CMakeLists.txt (100%) rename {source/armarx/navigation => examples}/components/example_client/Component.cpp (100%) rename {source/armarx/navigation => examples}/components/example_client/Component.h (100%) diff --git a/source/armarx/navigation/components/example_client/CMakeLists.txt b/examples/components/example_client/CMakeLists.txt similarity index 100% rename from source/armarx/navigation/components/example_client/CMakeLists.txt rename to examples/components/example_client/CMakeLists.txt diff --git a/source/armarx/navigation/components/example_client/Component.cpp b/examples/components/example_client/Component.cpp similarity index 100% rename from source/armarx/navigation/components/example_client/Component.cpp rename to examples/components/example_client/Component.cpp diff --git a/source/armarx/navigation/components/example_client/Component.h b/examples/components/example_client/Component.h similarity index 100% rename from source/armarx/navigation/components/example_client/Component.h rename to examples/components/example_client/Component.h -- GitLab From 43778aa35b0fd7de4286a270ed86edecc4008cc6 Mon Sep 17 00:00:00 2001 From: Fabian Reister <fabian.reister@kit.edu> Date: Fri, 3 Jun 2022 13:35:58 +0200 Subject: [PATCH 2/2] cmake. examples fix --- CMakeLists.txt | 1 + examples/CMakeLists.txt | 1 + source/armarx/navigation/components/CMakeLists.txt | 5 +---- 3 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 examples/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 42074e06..072b8adb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,5 +48,6 @@ add_definitions(-Werror=reorder) add_definitions(-Werror=narrowing) add_subdirectory(source) +add_subdirectory(examples) armarx_install_project() diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt new file mode 100644 index 00000000..4454172b --- /dev/null +++ b/examples/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(components/example_client) diff --git a/source/armarx/navigation/components/CMakeLists.txt b/source/armarx/navigation/components/CMakeLists.txt index 34e29e91..d0cdc317 100644 --- a/source/armarx/navigation/components/CMakeLists.txt +++ b/source/armarx/navigation/components/CMakeLists.txt @@ -2,7 +2,4 @@ add_subdirectory(GraphImportExport) add_subdirectory(NavigationMemory) add_subdirectory(Navigator) -# Examples -add_subdirectory(example_client) - -add_subdirectory(dynamic_distance_to_obstacle_costmap_provider) \ No newline at end of file +add_subdirectory(dynamic_distance_to_obstacle_costmap_provider) -- GitLab