From 53f6fcca1cbf66e5603a79f6e448fadfdf400664 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Wed, 23 Oct 2019 22:08:01 +0200 Subject: [PATCH] [wip/timeoptimization] add patch-ac, to fix linking --- timeoptimization/PLIST | 6 +++--- timeoptimization/distinfo | 1 + timeoptimization/patches/patch-ac | 12 ++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 timeoptimization/patches/patch-ac diff --git a/timeoptimization/PLIST b/timeoptimization/PLIST index 24ed1fde..c0368323 100644 --- a/timeoptimization/PLIST +++ b/timeoptimization/PLIST @@ -4,9 +4,9 @@ include/momentumopt/cntopt/ContactPlanInterface.hpp include/momentumopt/cntopt/ContactState.hpp include/momentumopt/dynopt/DynamicsOptimizer.hpp include/momentumopt/dynopt/DynamicsState.hpp -include/momentumopt/settting/Definitions.hpp -include/momentumopt/settting/PlannerParams.hpp -include/momentumopt/settting/PlannerSetting.hpp +include/momentumopt/setting/Definitions.hpp +include/momentumopt/setting/PlannerParams.hpp +include/momentumopt/setting/PlannerSetting.hpp include/momentumopt/utilities/Clock.hpp include/momentumopt/yaml_eigen.h include/timeoptimization/solver/interface/Cone.hpp diff --git a/timeoptimization/distinfo b/timeoptimization/distinfo index 06e38117..bfa0254d 100644 --- a/timeoptimization/distinfo +++ b/timeoptimization/distinfo @@ -3,3 +3,4 @@ RMD160 (timeoptimization-1.1.0.tar.gz) = 24ab2cd36661fa6e9e778fb61404bf522202cd1 Size (timeoptimization-1.1.0.tar.gz) = 264650 bytes SHA1 (patch-aa) = 07b729920a0e8692dacab15e7da00a28b019abe9 SHA1 (patch-ab) = 6710298ebff374a2adcb990dc6becaab8f4254c3 +SHA1 (patch-ac) = 50541c0ab766981b8986e19846ba8795050eabbc diff --git a/timeoptimization/patches/patch-ac b/timeoptimization/patches/patch-ac new file mode 100644 index 00000000..12b83f4f --- /dev/null +++ b/timeoptimization/patches/patch-ac @@ -0,0 +1,12 @@ +fix link + +--- momentumopt/CMakeLists.txt.orig 2019-10-23 22:04:53.000000000 +0200 ++++ momentumopt/CMakeLists.txt 2019-10-23 22:05:26.509233012 +0200 +@@ -62,6 +62,7 @@ + set(momentumopt_LIBS + ${Boost_LIBRARIES} + ${catkin_LIBRARIES} ++ ${YAML_CPP_LIBRARIES} + ) + IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + set(momentumopt_LIBS ${momentumopt_LIBS} rt) -- GitLab