Skip to content
Snippets Groups Projects
Commit 089778dc authored by Olivier Stasse's avatar Olivier Stasse
Browse files

[wip/sot-dynamic-pinocchio-v3] Fix missing dependency to eigenpy.

Fix CMakefiles to take into account BUILD_PYTHON_INTERFACE.
parent 846477aa
No related branches found
No related tags found
No related merge requests found
......@@ -5,6 +5,7 @@
ORG= stack-of-tasks
NAME= sot-dynamic-pinocchio
VERSION= 3.2.2
PKGREVISION= 2
DISTNAME= ${NAME}-v3-${VERSION}
PKGNAME= ${NAME}-v3-${VERSION}
......@@ -29,6 +30,7 @@ DYNAMIC_PLIST_DIRS+= share/doc/${NAME}
include ../../devel/tinyxml/depend.mk
include ../../math/pinocchio/depend.mk
include ../../math/py-eigenpy/depend.mk
include ../../wip/sot-core-v3/depend.mk
include ../../wip/sot-tools-v3/depend.mk
include ../../pkgtools/pkg-config/depend.mk
......
SHA1 (sot-dynamic-pinocchio-v3-3.2.2.tar.gz) = e4fc2d6a95e552634feac0afcbabbb4f232f3540
RMD160 (sot-dynamic-pinocchio-v3-3.2.2.tar.gz) = 0eed4e379b5aabc6fa9f95604b9122ef06fbc9bd
Size (sot-dynamic-pinocchio-v3-3.2.2.tar.gz) = 859578 bytes
SHA1 (sot-dynamic-pinocchio-v3-3.2.2.tar.gz) = 594aa30aa63f780dc10d83bda731b5dd6ca313d5
RMD160 (sot-dynamic-pinocchio-v3-3.2.2.tar.gz) = ae594fa02a36591ebdd84839679c8989354a0250
Size (sot-dynamic-pinocchio-v3-3.2.2.tar.gz) = 859581 bytes
SHA1 (patch-aa) = 485f513ca5bb245452745a546d77ebd8a3497836
SHA1 (patch-ab) = c041161979d98b4380ed62ae4990184aead6331b
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -42,7 +42,6 @@ SET(PKG_CONFIG_ADDITIONAL_VARIABLES
SETUP_PROJECT()
# Search for dependencies.
-ADD_REQUIRED_DEPENDENCY("eigenpy")
ADD_REQUIRED_DEPENDENCY("pinocchio >= 1.2.6")
ADD_REQUIRED_DEPENDENCY("dynamic-graph >= 3.0.0")
ADD_REQUIRED_DEPENDENCY("sot-core >= 3.0.0")
@@ -56,6 +55,7 @@ IF(BUILD_PYTHON_INTERFACE)
ADD_REQUIRED_DEPENDENCY("dynamic-graph-python >= 3.0.0")
SET(BOOST_COMPONENTS ${BOOST_COMPONENTS} python)
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
+ ADD_REQUIRED_DEPENDENCY("eigenpy")
ENDIF(BUILD_PYTHON_INTERFACE)
--
2.7.4
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -43,7 +43,9 @@ FOREACH(lib ${plugins})
TARGET_LINK_LIBRARIES(${libname} ${Boost_LIBRARIES})
PKG_CONFIG_USE_DEPENDENCY(${libname} pinocchio)
- PKG_CONFIG_USE_DEPENDENCY(${libname} eigenpy)
+ IF(BUILD_PYTHON_INTERFACE)
+ PKG_CONFIG_USE_DEPENDENCY(${libname} eigenpy)
+ ENDIF(BUILD_PYTHON_INTERFACE)
PKG_CONFIG_USE_DEPENDENCY(${libname} sot-core)
PKG_CONFIG_USE_DEPENDENCY(${libname} dynamic-graph)
--
2.7.4
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