From 66cb68747b7faab374b9ed6276fe5c6b31fec7be Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Mon, 25 Oct 2021 09:09:39 +0200
Subject: [PATCH] ranges v3 is only a private dependency => fixed
CMakeLists.txt
---
source/armarx/navigation/core/CMakeLists.txt | 25 +++++++++++--------
.../navigation/global_planning/CMakeLists.txt | 17 +++++++------
.../armarx/navigation/server/CMakeLists.txt | 22 ++++++++--------
.../armarx/navigation/server/GraphBuilder.h | 2 --
4 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/source/armarx/navigation/core/CMakeLists.txt b/source/armarx/navigation/core/CMakeLists.txt
index 6332fb90..1642f3fe 100644
--- a/source/armarx/navigation/core/CMakeLists.txt
+++ b/source/armarx/navigation/core/CMakeLists.txt
@@ -30,17 +30,20 @@ armarx_add_library(core
time/ChronoMonotonicTimeServer.h
time/TimeServerInterface.h
DEPENDENCIES
- ArmarXCoreInterfaces
- ArmarXCore
- ArmarXCoreObservers # variant
- # RobotAPI
- aron
- aroncommon
- RobotAPIInterfaces
- SemanticObjectRelations
- Simox::VirtualRobot
- range-v3
- armarx_navigation::core_aron
+ PUBLIC
+ ArmarXCoreInterfaces
+ ArmarXCore
+ ArmarXCoreObservers # variant
+ # RobotAPI
+ aron
+ aroncommon
+ RobotAPIInterfaces
+ SemanticObjectRelations
+ Simox::VirtualRobot
+ armarx_navigation::core_aron
+ PRIVATE
+ range-v3
+
)
armarx_add_test(core_test
diff --git a/source/armarx/navigation/global_planning/CMakeLists.txt b/source/armarx/navigation/global_planning/CMakeLists.txt
index 43b7e9e6..87d9bd68 100644
--- a/source/armarx/navigation/global_planning/CMakeLists.txt
+++ b/source/armarx/navigation/global_planning/CMakeLists.txt
@@ -7,13 +7,16 @@ armarx_add_aron_library(global_planning_aron
armarx_add_library(global_planning
DEPENDENCIES
- ceres
- ArmarXCoreInterfaces
- ArmarXCore
- aroncommon
- armarx_navigation::core
- armarx_navigation::algorithms
- armarx_navigation::global_planning_aron
+ PUBLIC
+ ceres
+ ArmarXCoreInterfaces
+ ArmarXCore
+ aroncommon
+ armarx_navigation::core
+ armarx_navigation::algorithms
+ armarx_navigation::global_planning_aron
+ PRIVATE
+ range-v3
SOURCES
./GlobalPlanner.cpp
./AStar.cpp
diff --git a/source/armarx/navigation/server/CMakeLists.txt b/source/armarx/navigation/server/CMakeLists.txt
index b499b0e9..8104e096 100644
--- a/source/armarx/navigation/server/CMakeLists.txt
+++ b/source/armarx/navigation/server/CMakeLists.txt
@@ -35,16 +35,18 @@ armarx_add_library(server
# parameterization
./parameterization/MemoryParameterizationService.h
DEPENDENCIES
- ArmarXCoreInterfaces
- ArmarXCore
- ArViz # RobotAPI
- armarx_navigation::core
- armarx_navigation::global_planning
- armarx_navigation::local_planning
- armarx_navigation::trajectory_control
- armarx_navigation::safety_control
- armarx_navigation::memory
- range-v3
+ PUBLIC
+ ArmarXCoreInterfaces
+ ArmarXCore
+ ArViz # RobotAPI
+ armarx_navigation::core
+ armarx_navigation::global_planning
+ armarx_navigation::local_planning
+ armarx_navigation::trajectory_control
+ armarx_navigation::safety_control
+ armarx_navigation::memory
+ PRIVATE
+ range-v3
)
armarx_add_test(server_test
diff --git a/source/armarx/navigation/server/GraphBuilder.h b/source/armarx/navigation/server/GraphBuilder.h
index b322f5b2..5169b9ce 100644
--- a/source/armarx/navigation/server/GraphBuilder.h
+++ b/source/armarx/navigation/server/GraphBuilder.h
@@ -24,8 +24,6 @@
#include <cstdint>
#include <vector>
-#include <range/v3/algorithm/permutation.hpp>
-
#include <SemanticObjectRelations/Shapes/Shape.h>
#include <armarx/navigation/client/PathBuilder.h>
#include <armarx/navigation/core/Graph.h>
--
GitLab