Skip to content
Snippets Groups Projects
Commit 318df006 authored by ArmarX User's avatar ArmarX User
Browse files

fix merge of cmakelists

parent b783b88a
No related branches found
No related tags found
No related merge requests found
......@@ -54,40 +54,6 @@ list(APPEND LIB_FILES
BimanualForceControllers/NJointBimanualObjLevelController.cpp
)
(??) message(STATUS "DMP libraries is ${DMP_LIBRARIES}")
(??)
(??)
(??) list(APPEND LIB_HEADERS
(??) DMPController/NJointJSDMPController.h
(??) DMPController/NJointTSDMPController.h
(??) DMPController/NJointCCDMPController.h
(??) DMPController/NJointBimanualCCDMPController.h
(??) DMPController/NJointBimanualCCDMPVelocityController.h
(??) DMPController/NJointTaskSpaceImpedanceDMPController.h
(??) DMPController/NJointBimanualForceMPController.h
(??) DMPController/NJointPeriodicTSDMPForwardVelController.h
(??) DMPController/NJointPeriodicTSDMPCompliantController.h
(??) DMPController/NJointAdaptiveWipingController.h
(??) DMPController/NJointAnomalyDetectionAdaptiveWipingController.h
(??) BimanualForceControllers/NJointBimanualForceController.h
(??) )
(??) list(APPEND LIB_FILES
(??) DMPController/NJointJSDMPController.cpp
(??) DMPController/NJointTSDMPController.cpp
(??) DMPController/NJointCCDMPController.cpp
(??) DMPController/NJointBimanualCCDMPController.cpp
(??) DMPController/NJointBimanualCCDMPVelocityController.cpp
(??) DMPController/NJointTaskSpaceImpedanceDMPController.cpp
(??) DMPController/NJointBimanualForceMPController.cpp
(??) DMPController/NJointPeriodicTSDMPForwardVelController.cpp
(??) DMPController/NJointPeriodicTSDMPCompliantController.cpp
(??) DMPController/NJointAdaptiveWipingController.cpp
(??) DMPController/NJointAnomalyDetectionAdaptiveWipingController.cpp
(??) BimanualForceControllers/NJointBimanualForceController.cpp
(??) )
(??)
(??) list(APPEND LIBS ${DMP_LIBRARIES} DMPController)
armarx_add_library("${LIB_NAME}" "${LIB_FILES}" "${LIB_HEADERS}" "${LIBS}")
if(DMP_FOUND)
target_include_directories("${LIB_NAME}" PUBLIC ${DMP_INCLUDE_DIRS})
......
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