From 7c4b601be6c5811dccda809a3bf8d93c879a3ee2 Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Sun, 15 May 2022 11:54:20 +0200
Subject: [PATCH] CMake: repacing DEPENDENCIES PUBLIC... by DEPENDENCIES_PUBLIC
---
source/armarx/navigation/core/CMakeLists.txt | 27 +++++++++----------
.../navigation/global_planning/CMakeLists.txt | 21 +++++++--------
.../armarx/navigation/server/CMakeLists.txt | 5 ++--
3 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/source/armarx/navigation/core/CMakeLists.txt b/source/armarx/navigation/core/CMakeLists.txt
index e01f7daf..6b56cc43 100644
--- a/source/armarx/navigation/core/CMakeLists.txt
+++ b/source/armarx/navigation/core/CMakeLists.txt
@@ -37,20 +37,19 @@ armarx_add_library(core
json_conversions.h
time/ChronoMonotonicTimeServer.h
time/TimeServerInterface.h
- DEPENDENCIES
- PUBLIC
- ArmarXCoreInterfaces
- ArmarXCore
- ArmarXCoreObservers # variant
- # RobotAPI
- aron
- aroncommon
- RobotAPIInterfaces
- SemanticObjectRelations
- Simox::VirtualRobot
- armarx_navigation::core_aron
- PRIVATE
- range-v3::range-v3
+ DEPENDENCIES_PUBLIC
+ ArmarXCoreInterfaces
+ ArmarXCore
+ ArmarXCoreObservers # variant
+ # RobotAPI
+ aron
+ aroncommon
+ RobotAPIInterfaces
+ SemanticObjectRelations
+ Simox::VirtualRobot
+ armarx_navigation::core_aron
+ DEPENDENCIES_PRIVATE
+ range-v3::range-v3
)
diff --git a/source/armarx/navigation/global_planning/CMakeLists.txt b/source/armarx/navigation/global_planning/CMakeLists.txt
index 88d4191f..5ba8c72f 100644
--- a/source/armarx/navigation/global_planning/CMakeLists.txt
+++ b/source/armarx/navigation/global_planning/CMakeLists.txt
@@ -7,17 +7,16 @@ armarx_add_aron_library(global_planning_aron
)
armarx_add_library(global_planning
- DEPENDENCIES
- PUBLIC
- ceres
- ArmarXCoreInterfaces
- ArmarXCore
- aroncommon
- armarx_navigation::core
- armarx_navigation::algorithms
- armarx_navigation::global_planning_aron
- PRIVATE
- range-v3::range-v3
+ DEPENDENCIES_PUBLIC
+ Ceres::ceres
+ ArmarXCoreInterfaces
+ ArmarXCore
+ aroncommon
+ armarx_navigation::core
+ armarx_navigation::algorithms
+ armarx_navigation::global_planning_aron
+ DEPENDENCIES_PRIVATE
+ range-v3::range-v3
SOURCES
./GlobalPlanner.cpp
./AStar.cpp
diff --git a/source/armarx/navigation/server/CMakeLists.txt b/source/armarx/navigation/server/CMakeLists.txt
index b9f7a261..25eae227 100644
--- a/source/armarx/navigation/server/CMakeLists.txt
+++ b/source/armarx/navigation/server/CMakeLists.txt
@@ -34,8 +34,7 @@ armarx_add_library(server
./monitoring/GoalReachedMonitor.h
# parameterization
./parameterization/MemoryParameterizationService.h
- DEPENDENCIES
- PUBLIC
+ DEPENDENCIES_PUBLIC
ArmarXCoreInterfaces
ArmarXCore
ArViz # RobotAPI
@@ -46,7 +45,7 @@ armarx_add_library(server
armarx_navigation::trajectory_control
armarx_navigation::safety_control
armarx_navigation::memory
- PRIVATE
+ DEPENDENCIES_PRIVATE
range-v3::range-v3
)
--
GitLab