From 2a224d423ff771f393565e7bf94c64ad5a99d36b Mon Sep 17 00:00:00 2001 From: armar-user <armar6@kit> Date: Mon, 25 Jul 2022 12:59:02 +0200 Subject: [PATCH] cmake fixes --- source/armarx/navigation/platform_controller/CMakeLists.txt | 2 +- .../platform_controller/PlatformTrajectoryController.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/armarx/navigation/platform_controller/CMakeLists.txt b/source/armarx/navigation/platform_controller/CMakeLists.txt index abeeec07..509c8f9a 100644 --- a/source/armarx/navigation/platform_controller/CMakeLists.txt +++ b/source/armarx/navigation/platform_controller/CMakeLists.txt @@ -17,7 +17,7 @@ armarx_add_library(platform_controller DEPENDENCIES_PUBLIC Simox::VirtualRobot armarx_control::common - armarx_control::njoint_qp_controller_ice + armarx_control::client armarx_navigation::core armarx_navigation::trajectory_control # armarx_control::njoint_qp_controller_aron diff --git a/source/armarx/navigation/platform_controller/PlatformTrajectoryController.cpp b/source/armarx/navigation/platform_controller/PlatformTrajectoryController.cpp index 91106344..a95f6d38 100644 --- a/source/armarx/navigation/platform_controller/PlatformTrajectoryController.cpp +++ b/source/armarx/navigation/platform_controller/PlatformTrajectoryController.cpp @@ -9,7 +9,7 @@ #include <armarx/control/common/aron_conversions.h> #include <armarx/control/common/type.h> -#include <armarx/control/common/utils.h> +// #include <armarx/control/common/utils.h> #include <armarx/navigation/common/controller_types.h> #include <armarx/navigation/platform_controller/aron/PlatformTrajectoryControllerConfig.aron.generated.h> #include <armarx/navigation/platform_controller/aron_conversions.h> -- GitLab