Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
pinocchio
Commits
d3634144
Commit
d3634144
authored
Mar 31, 2017
by
Justin Carpentier
Committed by
GitHub
Mar 31, 2017
Browse files
Merge pull request #383 from jcarpent/devel
Handle FCL exposition if hpp-fcl is not found
parents
13062b03
0fde609c
Changes
1
Hide whitespace changes
Inline
Side-by-side
bindings/python/CMakeLists.txt
View file @
d3634144
...
...
@@ -83,10 +83,6 @@ SET(${PROJECT_NAME}_PYTHON_HEADERS
multibody/joint/joints-variant.hpp
multibody/joint/joint.hpp
multibody/joint/joint-derived.hpp
multibody/fcl/contact.hpp
multibody/fcl/collision-result.hpp
# multibody/fcl/distance-result.hpp
multibody/fcl/collision-geometry.hpp
algorithm/algorithms.hpp
parsers/parsers.hpp
)
...
...
@@ -103,7 +99,6 @@ SET(${PROJECT_NAME}_PYTHON_SOURCES
multibody/expose-data.cpp
multibody/expose-geometry.cpp
multibody/joint/expose-joints.cpp
multibody/fcl/expose-fcl.cpp
algorithm/expose-algorithms.cpp
algorithm/expose-com.cpp
algorithm/expose-kinematics.cpp
...
...
@@ -120,6 +115,7 @@ SET(${PROJECT_NAME}_PYTHON_SOURCES
parsers/expose-parsers.cpp
)
# Parser for Python model
SET
(
${
PROJECT_NAME
}
_PARSER_PYTHON_HEADERS
parsers/python.hpp
)
...
...
@@ -128,6 +124,23 @@ SET(${PROJECT_NAME}_PARSER_PYTHON_SOURCES
parsers/python/model.cpp
)
# Python exposition of FCL
IF
(
HPP_FCL_FOUND
)
SET
(
${
PROJECT_NAME
}
_PYTHON_FCL_HEADERS
multibody/fcl/contact.hpp
multibody/fcl/collision-result.hpp
# multibody/fcl/distance-result.hpp
multibody/fcl/collision-geometry.hpp
)
SET
(
${
PROJECT_NAME
}
_PYTHON_FCL_SOURCES
multibody/fcl/expose-fcl.cpp
)
LIST
(
APPEND
${
PROJECT_NAME
}
_PYTHON_HEADERS
${${
PROJECT_NAME
}
_PYTHON_FCL_HEADERS
}
)
LIST
(
APPEND
${
PROJECT_NAME
}
_PYTHON_SOURCES
${${
PROJECT_NAME
}
_PYTHON_FCL_SOURCES
}
)
ENDIF
(
HPP_FCL_FOUND
)
LIST
(
APPEND HEADERS
${${
PROJECT_NAME
}
_PYTHON_HEADERS
}
)
LIST
(
REMOVE_DUPLICATES HEADERS
)
...
...
@@ -136,7 +149,9 @@ MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio/bindings/python"
MAKE_DIRECTORY
(
"
${${
PROJECT_NAME
}
_BINARY_DIR
}
/include/pinocchio/bindings/python/spatial"
)
MAKE_DIRECTORY
(
"
${${
PROJECT_NAME
}
_BINARY_DIR
}
/include/pinocchio/bindings/python/multibody"
)
MAKE_DIRECTORY
(
"
${${
PROJECT_NAME
}
_BINARY_DIR
}
/include/pinocchio/bindings/python/multibody/joint"
)
MAKE_DIRECTORY
(
"
${${
PROJECT_NAME
}
_BINARY_DIR
}
/include/pinocchio/bindings/python/multibody/fcl"
)
IF
(
HPP_FCL_FOUND
)
MAKE_DIRECTORY
(
"
${${
PROJECT_NAME
}
_BINARY_DIR
}
/include/pinocchio/bindings/python/multibody/fcl"
)
ENDIF
(
HPP_FCL_FOUND
)
MAKE_DIRECTORY
(
"
${${
PROJECT_NAME
}
_BINARY_DIR
}
/include/pinocchio/bindings/python/parsers"
)
MAKE_DIRECTORY
(
"
${${
PROJECT_NAME
}
_BINARY_DIR
}
/include/pinocchio/bindings/python/algorithm"
)
MAKE_DIRECTORY
(
"
${${
PROJECT_NAME
}
_BINARY_DIR
}
/include/pinocchio/bindings/python/utils"
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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