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
Pierre Fernbach
tsid
Commits
859b11c4
Unverified
Commit
859b11c4
authored
May 16, 2019
by
Andrea Del Prete
Committed by
GitHub
May 16, 2019
Browse files
Merge pull request #48 from wxmerkt/wxm-reenable-catkin
Revert "[CMake] disable catkin for now"
parents
eeefef7b
09578010
Changes
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
859b11c4
...
...
@@ -77,7 +77,7 @@ ADD_REQUIRED_DEPENDENCY("eigen3 >= 3.2.0") # Eigen::Ref appeared from 3.2.0
# Fail-safe support for catkin-ized pinocchio:
# - If catkin-based pinocchio is installed it runs the CFG_EXTRAS to set up the Pinocchio preprocessor directives
# - If it isn't, nothing happens and the subsequent pkg-config check takes care of everything.
#
find_package(catkin QUIET COMPONENTS pinocchio)
find_package
(
catkin QUIET COMPONENTS pinocchio
)
ADD_REQUIRED_DEPENDENCY
(
"pinocchio >= 2.0.0"
)
...
...
@@ -88,7 +88,7 @@ SET(BOOST_OPTIONAL_COMPONENTS "")
IF
(
BUILD_PYTHON_INTERFACE
)
SET
(
BOOST_OPTIONAL_COMPONENTS
${
BOOST_OPTIONAL_COMPONENTS
}
python
)
FINDPYTHON
()
INCLUDE_DIRECTORIES
(
SYSTEM
${
PYTHON_INCLUDE_DIRS
}
)
INCLUDE_DIRECTORIES
(
SYSTEM
${
PYTHON_INCLUDE_DIRS
}
)
ADD_REQUIRED_DEPENDENCY
(
"eigenpy >= 1.4.0"
)
ENDIF
(
BUILD_PYTHON_INTERFACE
)
...
...
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