From 556d12d17c1370e0f518c89a0ddf87235c0c0c68 Mon Sep 17 00:00:00 2001
From: Christoph Pohl <christoph.pohl@kit.edu>
Date: Fri, 18 Jan 2019 17:25:22 +0100
Subject: [PATCH] conditional build of RobotAPINJointControllers
---
.../libraries/RobotAPINJointControllers/CMakeLists.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt b/source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
index 74ef54267..1c4a381c3 100644
--- a/source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
+++ b/source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
@@ -11,13 +11,14 @@ find_package(MMMTools QUIET)
armarx_build_if(Eigen3_FOUND "Eigen3 not available")
armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
+armarx_build_if(DMP_FOUND "DMP not available")
+
if (Eigen3_FOUND AND Simox_FOUND)
include_directories(${Simox_INCLUDE_DIRS})
include_directories(SYSTEM ${Eigen3_INCLUDE_DIR})
endif()
-
set(LIBS RobotAPIInterfaces ArmarXCoreObservers ArmarXCoreStatechart ArmarXCoreEigen3Variants
VirtualRobot
Saba
@@ -33,7 +34,6 @@ set(LIB_HEADERS
)
-if (DMP_FOUND )
message(STATUS "DMP libraries is ${DMP_LIBRARIES}")
include_directories(${DMP_INCLUDE_DIRS})
@@ -61,7 +61,6 @@ if (DMP_FOUND )
)
list(APPEND LIBS ${DMP_LIBRARIES} DMPController)
-endif ()
armarx_add_library("${LIB_NAME}" "${LIB_FILES}" "${LIB_HEADERS}" "${LIBS}")
--
GitLab