Skip to content
Snippets Groups Projects
Commit 66cb6874 authored by Fabian Reister's avatar Fabian Reister
Browse files

ranges v3 is only a private dependency => fixed CMakeLists.txt

parent 3a8fe83c
No related branches found
No related tags found
No related merge requests found
...@@ -30,17 +30,20 @@ armarx_add_library(core ...@@ -30,17 +30,20 @@ armarx_add_library(core
time/ChronoMonotonicTimeServer.h time/ChronoMonotonicTimeServer.h
time/TimeServerInterface.h time/TimeServerInterface.h
DEPENDENCIES DEPENDENCIES
ArmarXCoreInterfaces PUBLIC
ArmarXCore ArmarXCoreInterfaces
ArmarXCoreObservers # variant ArmarXCore
# RobotAPI ArmarXCoreObservers # variant
aron # RobotAPI
aroncommon aron
RobotAPIInterfaces aroncommon
SemanticObjectRelations RobotAPIInterfaces
Simox::VirtualRobot SemanticObjectRelations
range-v3 Simox::VirtualRobot
armarx_navigation::core_aron armarx_navigation::core_aron
PRIVATE
range-v3
) )
armarx_add_test(core_test armarx_add_test(core_test
......
...@@ -7,13 +7,16 @@ armarx_add_aron_library(global_planning_aron ...@@ -7,13 +7,16 @@ armarx_add_aron_library(global_planning_aron
armarx_add_library(global_planning armarx_add_library(global_planning
DEPENDENCIES DEPENDENCIES
ceres PUBLIC
ArmarXCoreInterfaces ceres
ArmarXCore ArmarXCoreInterfaces
aroncommon ArmarXCore
armarx_navigation::core aroncommon
armarx_navigation::algorithms armarx_navigation::core
armarx_navigation::global_planning_aron armarx_navigation::algorithms
armarx_navigation::global_planning_aron
PRIVATE
range-v3
SOURCES SOURCES
./GlobalPlanner.cpp ./GlobalPlanner.cpp
./AStar.cpp ./AStar.cpp
......
...@@ -35,16 +35,18 @@ armarx_add_library(server ...@@ -35,16 +35,18 @@ armarx_add_library(server
# parameterization # parameterization
./parameterization/MemoryParameterizationService.h ./parameterization/MemoryParameterizationService.h
DEPENDENCIES DEPENDENCIES
ArmarXCoreInterfaces PUBLIC
ArmarXCore ArmarXCoreInterfaces
ArViz # RobotAPI ArmarXCore
armarx_navigation::core ArViz # RobotAPI
armarx_navigation::global_planning armarx_navigation::core
armarx_navigation::local_planning armarx_navigation::global_planning
armarx_navigation::trajectory_control armarx_navigation::local_planning
armarx_navigation::safety_control armarx_navigation::trajectory_control
armarx_navigation::memory armarx_navigation::safety_control
range-v3 armarx_navigation::memory
PRIVATE
range-v3
) )
armarx_add_test(server_test armarx_add_test(server_test
......
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
#include <range/v3/algorithm/permutation.hpp>
#include <SemanticObjectRelations/Shapes/Shape.h> #include <SemanticObjectRelations/Shapes/Shape.h>
#include <armarx/navigation/client/PathBuilder.h> #include <armarx/navigation/client/PathBuilder.h>
#include <armarx/navigation/core/Graph.h> #include <armarx/navigation/core/Graph.h>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment