From 4581044487eb1c8889853c542eb9076be98ff6c6 Mon Sep 17 00:00:00 2001 From: Rainer Kartmann <rainer.kartmann@kit.edu> Date: Thu, 7 Jul 2022 10:30:10 +0200 Subject: [PATCH] Move find_package(manif) to top-level CMakeLists --- CMakeLists.txt | 1 + .../RobotAPI/libraries/armem_robot_state/server/CMakeLists.txt | 2 -- source/RobotAPI/libraries/ukfm/CMakeLists.txt | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a4902c6d..2185d2cc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,7 @@ depends_on_armarx_package(ArmarXGui) find_package(DMP QUIET) find_package(OpenCV QUIET) find_package(IVT COMPONENTS ivt ivtopencv QUIET) +find_package(manif QUIET) add_subdirectory(source) diff --git a/source/RobotAPI/libraries/armem_robot_state/server/CMakeLists.txt b/source/RobotAPI/libraries/armem_robot_state/server/CMakeLists.txt index 946ed29df..169d59f1a 100644 --- a/source/RobotAPI/libraries/armem_robot_state/server/CMakeLists.txt +++ b/source/RobotAPI/libraries/armem_robot_state/server/CMakeLists.txt @@ -7,8 +7,6 @@ armarx_component_set_name("${LIB_NAME}") armarx_set_target("Library: ${LIB_NAME}") armarx_build_if(Eigen3_FOUND "Eigen3 not available") - -find_package(manif QUIET) armarx_build_if(manif_FOUND "manif not available") armarx_add_library( diff --git a/source/RobotAPI/libraries/ukfm/CMakeLists.txt b/source/RobotAPI/libraries/ukfm/CMakeLists.txt index 96259ddeb..798d6767b 100644 --- a/source/RobotAPI/libraries/ukfm/CMakeLists.txt +++ b/source/RobotAPI/libraries/ukfm/CMakeLists.txt @@ -3,10 +3,7 @@ set(LIB_NAME ukfm) armarx_component_set_name("${LIB_NAME}") armarx_set_target("Library: ${LIB_NAME}") -find_package(manif QUIET) armarx_build_if(manif_FOUND "manif not available") - -find_package(Eigen3 QUIET) armarx_build_if(Eigen3_FOUND "Eigen3 not available") set(LIBS -- GitLab