diff --git a/CMakeLists.txt b/CMakeLists.txt index 55f00d742fad6752985f3b4b2cdb458aa59d661b..7bb71a61faeba60407707f82c24613453ef8401e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,7 @@ INCLUDE(cmake/base.cmake) INCLUDE(cmake/boost.cmake) INCLUDE(cmake/eigen.cmake) INCLUDE(cmake/python.cmake) +INCLUDE(CMakeDependentOption) SET(PROJECT_NAME pinocchio) SET(PROJECT_DESCRIPTION "Rigid multi body dynamics algorithms") @@ -60,12 +61,17 @@ OPTION (BUILD_UTILS "Build the utils" OFF) OPTION (INITIALIZE_WITH_NAN "Initialize Eigen entries with NaN" OFF) OPTION (BUILD_TESTS_WITH_HPP "Build geom tests and benchmarks with hpp to do comparisons" OFF) OPTION (BUILD_PYTHON_INTERFACE "Build the python binding" ON) +CMAKE_DEPENDENT_OPTION(BUILD_PYTHON_PARSER "Build pinocchio with the Python parser" ON "BUILD_PYTHON_INTERFACE" ON) IF (INITIALIZE_WITH_NAN) MESSAGE (STATUS "Initialize with NaN all the Eigen entries.") ADD_DEFINITIONS(-DEIGEN_INITIALIZE_MATRICES_BY_NAN) ENDIF (INITIALIZE_WITH_NAN) +IF(BUILD_PYTHON_PARSER) + SET(BUILD_PYTHON_INTERFACE ON) +ENDIF(BUILD_PYTHON_PARSER) + # ---------------------------------------------------- # --- DEPENDANCIES ----------------------------------- # ---------------------------------------------------- @@ -204,11 +210,11 @@ SET(${PROJECT_NAME}_PARSERS_HEADERS parsers/srdf.hpp ) -IF(BUILD_PYTHON_INTERFACE) +IF(BUILD_PYTHON_PARSER) LIST(APPEND ${PROJECT_NAME}_PARSERS_HEADERS parsers/python.hpp ) -ENDIF(BUILD_PYTHON_INTERFACE) +ENDIF(BUILD_PYTHON_PARSER) IF(URDFDOM_FOUND) LIST(APPEND ${PROJECT_NAME}_PARSERS_HEADERS diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ca77208420ae27734aba2f5d3fa23cb0e6a28ecb..d54466c8b7d2b1a6ac4ebbd65a2ba9cc50990f72 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -51,11 +51,11 @@ SET(${PROJECT_NAME}_PARSERS_SOURCES parsers/sample-models.cpp ) -IF(BUILD_PYTHON_INTERFACE) +IF(BUILD_PYTHON_PARSER) LIST(APPEND ${PROJECT_NAME}_PARSERS_SOURCES parsers/python.cpp ) -ENDIF(BUILD_PYTHON_INTERFACE) +ENDIF(BUILD_PYTHON_PARSER) IF(URDFDOM_FOUND) LIST(APPEND ${PROJECT_NAME}_PARSERS_SOURCES @@ -86,9 +86,9 @@ IF(UNIX) PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} eigen3) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${Boost_LIBRARIES}) - IF(BUILD_PYTHON_INTERFACE) + IF(BUILD_PYTHON_PARSER) TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME}) - ENDIF(BUILD_PYTHON_INTERFACE) + ENDIF(BUILD_PYTHON_PARSER) IF(URDFDOM_FOUND) PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} urdfdom)