diff --git a/CMakeLists.txt b/CMakeLists.txt index 543659b10aa10ee324a20d37a393f2eb0040ef0f..0c75238812322252e89a45b197f9644a4451c3ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) INCLUDE(cmake/base.cmake) INCLUDE(cmake/test.cmake) +INCLUDE(cmake/python.cmake) SET(PROJECT_NAMESPACE gepetto) SET(PROJECT_NAME example-robot-data) @@ -11,9 +12,14 @@ SET(PROJECT_URL https://gepgitlab.laas.fr/${PROJECT_NAMESPACE}/${PROJECT_NAME}) SETUP_PROJECT() +ADD_REQUIRED_DEPENDENCY("pinocchio >= 2.1.0") + +FINDPYTHON() + INSTALL(DIRECTORY hyq_description DESTINATION share/${PROJECT_NAME}) INSTALL(DIRECTORY talos_data DESTINATION share/${PROJECT_NAME}) +ADD_SUBDIRECTORY(python) ADD_SUBDIRECTORY(unittest) SETUP_PROJECT_FINALIZE() diff --git a/python/CMakeList.txt b/python/CMakeList.txt new file mode 100644 index 0000000000000000000000000000000000000000..cba92ed25a2a961f0ada372f7669f76aa8e69f5d --- /dev/null +++ b/python/CMakeList.txt @@ -0,0 +1,10 @@ +SET(${PROJECT_NAME}_PYTHON_FILES + robots_loader.py + display.py + __init__.py + ) + +FOREACH(python ${${PROJECT_NAME}_PYTHON_FILES}) + PYTHON_BUILD(. ${python}) + INSTALL(FILES ${python} DESTINATION ${PYTHON_SITELIB}/examples_robot_data) +ENDFOREACH(python ${${PROJECT_NAME}_PYTHON_FILES}) diff --git a/python/__init__.py b/python/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..3d3f63d33f71163662a3fb00de55525d7bccf6d0 --- /dev/null +++ b/python/__init__.py @@ -0,0 +1,2 @@ +from robots_loader import (getModelPath, loadHyQ, loadICub, loadTalos, loadTalosArm, loadTiago, loadTiagoNoHand, + readParamsFromSrdf) diff --git a/unittest/unittest_utils.py b/python/robots_loader.py similarity index 100% rename from unittest/unittest_utils.py rename to python/robots_loader.py diff --git a/unittest/test_load.py b/unittest/test_load.py index 0654710bde17d033537a8211d9a6aa4b92d3eb6c..8e1f4e09a4454818e3c264ee5f8fe0ac21d618dc 100755 --- a/unittest/test_load.py +++ b/unittest/test_load.py @@ -2,7 +2,7 @@ import unittest -from unittest_utils import loadHyQ, loadICub, loadTalos, loadTalosArm, loadTiago, loadTiagoNoHand +from example_robot_data import loadHyQ, loadICub, loadTalos, loadTalosArm, loadTiago, loadTiagoNoHand class RobotTestCase(unittest.TestCase):