Commit d8985092 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[CMake] sync submodule and update its use

parent 7d240c3a
......@@ -75,17 +75,17 @@ ADD_PROJECT_DEPENDENCY(pinocchio 2.3.1 REQUIRED
ADD_PROJECT_DEPENDENCY(eiquadprog 1.1.3 REQUIRED
PKG_CONFIG_REQUIRES "eiquadprog >= 1.1.3")
SET(BOOST_COMPONENTS filesystem system unit_test_framework)
IF(BUILD_TESTING)
FIND_PACKAGE(Boost REQUIRED COMPONENTS unit_test_framework)
ENDIF(BUILD_TESTING)
IF(BUILD_PYTHON_INTERFACE)
FINDPYTHON()
SET(PYWRAP ${PROJECT_NAME}_pywrap)
ADD_PROJECT_DEPENDENCY(eigenpy REQUIRED PKG_CONFIG_REQUIRES eigenpy)
SET(BOOST_COMPONENTS ${BOOST_COMPONENTS} python)
SEARCH_FOR_BOOST_PYTHON(REQUIRED)
ENDIF(BUILD_PYTHON_INTERFACE)
SEARCH_FOR_BOOST()
# Main Library
SET(${PROJECT_NAME}_MATH_HEADERS
include/tsid/math/fwd.hpp
......@@ -252,7 +252,7 @@ ADD_SOURCE_GROUP(${PROJECT_NAME}_SOURCES)
ADD_LIBRARY(${PROJECT_NAME} SHARED
${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS})
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${Boost_LIBRARIES}
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC
pinocchio::pinocchio eiquadprog::eiquadprog)
......
......@@ -28,8 +28,8 @@ FILE(GLOB ${PYWRAP}_SOURCES
)
ADD_LIBRARY(${PYWRAP} SHARED ${${PYWRAP}_SOURCES} ${${PYWRAP}_HEADERS})
TARGET_LINK_LIBRARIES(${PYWRAP} PUBLIC ${PROJECT_NAME} ${Boost_PYTHON_LIBRARY}
pinocchio::pinocchio eigenpy::eigenpy)
TARGET_LINK_LIBRARIES(${PYWRAP} PUBLIC ${PROJECT_NAME} eigenpy::eigenpy)
TARGET_LINK_BOOST_PYTHON(${PYWRAP} PRIVATE)
IF(BUILD_WITH_COMMIT_VERSION)
TAG_LIBRARY_VERSION(${PYWRAP})
......@@ -51,5 +51,5 @@ SET(PYTHON_FILES
)
FOREACH(python ${PYTHON_FILES})
PYTHON_INSTALL_ON_SITE(${PROJECT_NAME} ${python})
PYTHON_INSTALL_ON_SITE(${PROJECT_NAME} ${python})
ENDFOREACH(python)
Subproject commit c333a88decb3e4c0a86947bc6c7f072dc5c5df20
Subproject commit c6e4768fc40c1da1bdee04354538151b9c898acf
......@@ -30,10 +30,7 @@ MACRO(ADD_TESTCASE NAME)
STRING(REGEX REPLACE "-" "_" MODULE_NAME ${MODULE_NAME})
ADD_TEST_CFLAGS(${NAME} "-DBOOST_TEST_MODULE=${MODULE_NAME}")
TARGET_LINK_LIBRARIES(${NAME} ${PROJECT_NAME}
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
pinocchio::pinocchio
eiquadprog::eiquadprog)
TARGET_LINK_LIBRARIES(${NAME} PRIVATE ${PROJECT_NAME} Boost::unit_test_framework)
ENDMACRO(ADD_TESTCASE)
# --- RULES -------------------------------------------------------------------
......
Markdown is supported
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