Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
sot-dynamic-pinocchio
Commits
e9b8450f
Commit
e9b8450f
authored
Sep 04, 2018
by
Guilhem Saurel
Browse files
[CMake] depend on eigenpy only if we build the python interface
parent
979c857e
Pipeline
#1714
passed with stage
in 5 minutes and 14 seconds
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
e9b8450f
...
@@ -42,7 +42,6 @@ SET(PKG_CONFIG_ADDITIONAL_VARIABLES
...
@@ -42,7 +42,6 @@ SET(PKG_CONFIG_ADDITIONAL_VARIABLES
SETUP_PROJECT
()
SETUP_PROJECT
()
# Search for dependencies.
# Search for dependencies.
ADD_REQUIRED_DEPENDENCY
(
"eigenpy"
)
ADD_REQUIRED_DEPENDENCY
(
"pinocchio >= 1.3.0"
)
ADD_REQUIRED_DEPENDENCY
(
"pinocchio >= 1.3.0"
)
ADD_REQUIRED_DEPENDENCY
(
"dynamic-graph >= 3.0.0"
)
ADD_REQUIRED_DEPENDENCY
(
"dynamic-graph >= 3.0.0"
)
ADD_REQUIRED_DEPENDENCY
(
"sot-core >= 3.0.0"
)
ADD_REQUIRED_DEPENDENCY
(
"sot-core >= 3.0.0"
)
...
@@ -56,6 +55,7 @@ IF(BUILD_PYTHON_INTERFACE)
...
@@ -56,6 +55,7 @@ IF(BUILD_PYTHON_INTERFACE)
ADD_REQUIRED_DEPENDENCY
(
"dynamic-graph-python >= 3.0.0"
)
ADD_REQUIRED_DEPENDENCY
(
"dynamic-graph-python >= 3.0.0"
)
SET
(
BOOST_COMPONENTS
${
BOOST_COMPONENTS
}
python
)
SET
(
BOOST_COMPONENTS
${
BOOST_COMPONENTS
}
python
)
INCLUDE_DIRECTORIES
(
${
PYTHON_INCLUDE_PATH
}
)
INCLUDE_DIRECTORIES
(
${
PYTHON_INCLUDE_PATH
}
)
ADD_REQUIRED_DEPENDENCY
(
"eigenpy"
)
ENDIF
(
BUILD_PYTHON_INTERFACE
)
ENDIF
(
BUILD_PYTHON_INTERFACE
)
...
...
src/CMakeLists.txt
View file @
e9b8450f
...
@@ -43,7 +43,6 @@ FOREACH(lib ${plugins})
...
@@ -43,7 +43,6 @@ FOREACH(lib ${plugins})
TARGET_LINK_LIBRARIES
(
${
libname
}
${
Boost_LIBRARIES
}
)
TARGET_LINK_LIBRARIES
(
${
libname
}
${
Boost_LIBRARIES
}
)
PKG_CONFIG_USE_DEPENDENCY
(
${
libname
}
pinocchio
)
PKG_CONFIG_USE_DEPENDENCY
(
${
libname
}
pinocchio
)
PKG_CONFIG_USE_DEPENDENCY
(
${
libname
}
eigenpy
)
PKG_CONFIG_USE_DEPENDENCY
(
${
libname
}
sot-core
)
PKG_CONFIG_USE_DEPENDENCY
(
${
libname
}
sot-core
)
PKG_CONFIG_USE_DEPENDENCY
(
${
libname
}
dynamic-graph
)
PKG_CONFIG_USE_DEPENDENCY
(
${
libname
}
dynamic-graph
)
...
@@ -51,6 +50,7 @@ FOREACH(lib ${plugins})
...
@@ -51,6 +50,7 @@ FOREACH(lib ${plugins})
# build python submodule
# build python submodule
IF
(
BUILD_PYTHON_INTERFACE
)
IF
(
BUILD_PYTHON_INTERFACE
)
PKG_CONFIG_USE_DEPENDENCY
(
${
libname
}
eigenpy
)
STRING
(
REPLACE - _ PYTHON_LIBRARY_NAME
${
lib
}
)
STRING
(
REPLACE - _ PYTHON_LIBRARY_NAME
${
lib
}
)
DYNAMIC_GRAPH_PYTHON_MODULE
(
"sot/dynamics_pinocchio/
${
PYTHON_LIBRARY_NAME
}
"
DYNAMIC_GRAPH_PYTHON_MODULE
(
"sot/dynamics_pinocchio/
${
PYTHON_LIBRARY_NAME
}
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment