Skip to content
Snippets Groups Projects
Commit e30eb220 authored by jcarpent's avatar jcarpent
Browse files

[CMake] Split boost components

parent afa9e007
No related branches found
No related tags found
No related merge requests found
...@@ -109,15 +109,19 @@ IF(URDFDOM_FOUND) ...@@ -109,15 +109,19 @@ IF(URDFDOM_FOUND)
ENDIF(${URDFDOM_VERSION} VERSION_LESS "0.3.0") ENDIF(${URDFDOM_VERSION} VERSION_LESS "0.3.0")
ENDIF(URDFDOM_FOUND) ENDIF(URDFDOM_FOUND)
SET(BOOST_COMPONENTS filesystem unit_test_framework system) SET(BOOST_REQUIERED_COMPONENTS filesystem system)
SET(BOOST_BUILD_COMPONENTS unit_test_framework)
SET(BOOST_OPTIONAL_COMPONENTS "")
IF(BUILD_PYTHON_INTERFACE) IF(BUILD_PYTHON_INTERFACE)
SET(BOOST_COMPONENTS ${BOOST_COMPONENTS} python)
ADD_SEPARATE_DEPENDENCY("eigenpy >= 1.3.0") ADD_SEPARATE_DEPENDENCY("eigenpy >= 1.3.0")
SET(BOOST_OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COMPONENTS} python)
FINDPYTHON(2.7 EXACT REQUIRED) FINDPYTHON(2.7 EXACT REQUIRED)
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
ENDIF(BUILD_PYTHON_INTERFACE) ENDIF(BUILD_PYTHON_INTERFACE)
SET(BOOST_COMPONENTS ${BOOST_REQUIERED_COMPONENTS} ${BOOST_OPTIONAL_COMPONENTS} ${BOOST_BUILD_COMPONENTS})
SEARCH_FOR_BOOST() SEARCH_FOR_BOOST()
# Variable containing all the cflags definition relative to optional dependencies # Variable containing all the cflags definition relative to optional dependencies
...@@ -317,9 +321,9 @@ ADD_SUBDIRECTORY(benchmark) ...@@ -317,9 +321,9 @@ ADD_SUBDIRECTORY(benchmark)
# --- PACKAGING ---------------------------------------------------------------- # --- PACKAGING ----------------------------------------------------------------
PKG_CONFIG_APPEND_LIBS (${PROJECT_NAME}) PKG_CONFIG_APPEND_LIBS (${PROJECT_NAME})
PKG_CONFIG_APPEND_BOOST_LIBS(filesystem system) PKG_CONFIG_APPEND_BOOST_LIBS(${BOOST_REQUIERED_COMPONENTS})
IF(BUILD_PYTHON_PARSER) IF(BUILD_PYTHON_PARSER)
PKG_CONFIG_APPEND_BOOST_LIBS(python) PKG_CONFIG_APPEND_BOOST_LIBS(${BOOST_OPTIONAL_COMPONENTS})
ENDIF(BUILD_PYTHON_PARSER) ENDIF(BUILD_PYTHON_PARSER)
IF(EIGEN3_FUTURE) IF(EIGEN3_FUTURE)
......
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