Verified Commit 27637fd3 authored by Justin Carpentier's avatar Justin Carpentier
Browse files

cmake: change for SEARCH_FOR_BOOST_PYTHON

parent 1f209ed6
...@@ -125,11 +125,13 @@ ENDIF(BUILD_WITH_CASADI_SUPPORT) ...@@ -125,11 +125,13 @@ ENDIF(BUILD_WITH_CASADI_SUPPORT)
SET(BOOST_REQUIRED_COMPONENTS filesystem serialization system) SET(BOOST_REQUIRED_COMPONENTS filesystem serialization system)
SET(BOOST_BUILD_COMPONENTS unit_test_framework) SET(BOOST_BUILD_COMPONENTS unit_test_framework)
SET(BOOST_OPTIONAL_COMPONENTS "")
ADD_PROJECT_DEPENDENCY(Boost COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
FIND_PACKAGE(Boost COMPONENTS ${BOOST_BUILD_COMPONENTS})
IF(BUILD_PYTHON_INTERFACE) IF(BUILD_PYTHON_INTERFACE)
SET(BOOST_OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COMPONENTS} python)
FINDPYTHON() FINDPYTHON()
SEARCH_FOR_BOOST_PYTHON()
ADD_PROJECT_DEPENDENCY(eigenpy 2.5.0 REQUIRED) ADD_PROJECT_DEPENDENCY(eigenpy 2.5.0 REQUIRED)
ENDIF(BUILD_PYTHON_INTERFACE) ENDIF(BUILD_PYTHON_INTERFACE)
...@@ -154,8 +156,6 @@ IF(BUILD_WITH_HPP_FCL_SUPPORT) ...@@ -154,8 +156,6 @@ IF(BUILD_WITH_HPP_FCL_SUPPORT)
ENDIF(BUILD_PYTHON_INTERFACE) ENDIF(BUILD_PYTHON_INTERFACE)
ENDIF(BUILD_WITH_HPP_FCL_SUPPORT) ENDIF(BUILD_WITH_HPP_FCL_SUPPORT)
SET(BOOST_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} ${BOOST_OPTIONAL_COMPONENTS} ${BOOST_BUILD_COMPONENTS})
SEARCH_FOR_BOOST()
# Enforce the preprocessed version of boost::list and boost::vector # Enforce the preprocessed version of boost::list and boost::vector
# This information is redundant with the content of include/pinocchio/container/boost-container-limits.hpp # This information is redundant with the content of include/pinocchio/container/boost-container-limits.hpp
# but it avoids any compilation issue. # but it avoids any compilation issue.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment