diff --git a/CMakeLists.txt b/CMakeLists.txt index 637ce7554..5b2238427 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,7 +108,7 @@ include(YCMEPHelper) # Core if(ROBOTOLOGY_ENABLE_CORE) - find_or_build_package(RTF) + find_or_build_package(RobotTestingFramework) find_or_build_package(YARP) find_or_build_package(ICUB) find_or_build_package(ICUBcontrib) diff --git a/README.md b/README.md index 65a6c789d..af5f66469 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Note that any dependencies of the included packages that is not available in the | CMake Option | Description | Main packages included | Default Value | Profile-specific documentation | |:------------:|:-----------:|:---------------------:|:-------------:|:----:| -| `ROBOTOLOGY_ENABLE_CORE` | The core robotology software packages, necessary for most users. | [`YARP`](https://github.com/robotology/yarp), [`ICUB`](https://github.com/robotology/icub-main), [`RTF`](https://github.com/robotology/robot-testing), [`ICUBcontrib`](https://github.com/robotology/icub-contrib-common), [`icub-models`](https://github.com/robotology/icub-models) and[`icub-tests`](https://github.com/robotology/icub-tests). [`GazeboYARPPlugins`](https://github.com/robotology/GazeboYARPPlugins) and [`icub-gazebo`](https://github.com/robotology/icub-gazebo) if the `ROBOTOLOGY_USES_GAZEBO` option is enabled. | `ON` | [Documentation on Core profile.](#core) | +| `ROBOTOLOGY_ENABLE_CORE` | The core robotology software packages, necessary for most users. | [`YARP`](https://github.com/robotology/yarp), [`ICUB`](https://github.com/robotology/icub-main), [`RobotTestingFramework`](https://github.com/robotology/robot-testing-framework), [`ICUBcontrib`](https://github.com/robotology/icub-contrib-common), [`icub-models`](https://github.com/robotology/icub-models) and[`icub-tests`](https://github.com/robotology/icub-tests). [`GazeboYARPPlugins`](https://github.com/robotology/GazeboYARPPlugins) and [`icub-gazebo`](https://github.com/robotology/icub-gazebo) if the `ROBOTOLOGY_USES_GAZEBO` option is enabled. | `ON` | [Documentation on Core profile.](#core) | | `ROBOTOLOGY_ENABLE_DYNAMICS` | The robotology software packages related to balancing, walking and force control. | [`iDynTree`](https://github.com/robotology/idyntree), [`blockfactory`](https://github.com/robotology/blockfactory), [`wb-Toolbox`](https://github.com/robotology/wb-Toolbox), [`whole-body-controllers`](https://github.com/robotology/whole-body-controllers), [`walking-controllers`](https://github.com/robotology/walking-controllers). [`icub-gazebo-wholebody`](https://github.com/robotology-playground/icub-gazebo-wholebody) if the `ROBOTOLOGY_USES_GAZEBO` option is enabled. | `OFF` | [Documentation on Dynamics profile.](#dynamics) | | `ROBOTOLOGY_ENABLE_ICUB_HEAD` | The robotology software packages needed on the system that is running on the head of the iCub robot, or in general to communicate directly with iCub low-level devices. | [`robots-configurations`](https://github.com/robotology/robots-configuration), [`icub-firmware`](https://github.com/robotology/icub-firmware), [`icub-firmware-shared`](https://github.com/robotology/icub-firmware-shared). Furthermore, several additional devices are compiled in `YARP` and `ICUB` if this option is enabled. | `OFF` | [Documentation on iCub Head profile.](#icub-head) | | `ROBOTOLOGY_ENABLE_TELEOPERATION` | The robotology software packages related to teleoperation. | [`walking-teleoperation`](https://github.com/robotology/walking-teleoperation). To use Oculus or Cyberith Omnidirectional Treadmill enable `ROBOTOLOGY_USES_OCULUS_SDK` and `ROBOTOLOGY_USES_CYBERITH_SDK` options. | `OFF` | [Documentation on teleoperation profile.](#teleoperation) | diff --git a/cmake/BuildRTF.cmake b/cmake/BuildRTF.cmake deleted file mode 100644 index a12c2e92b..000000000 --- a/cmake/BuildRTF.cmake +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (C) 2017 iCub Facility, Istituto Italiano di Tecnologia -# Authors: Silvio Traversaro -# CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT - -include(YCMEPHelper) -include(FindOrBuildPackage) - -ycm_ep_helper(RTF TYPE GIT - STYLE GITHUB - REPOSITORY robotology/robot-testing.git - CMAKE_ARGS -DENABLE_LUA_PLUGIN:BOOL=${ROBOTOLOGY_USES_LUA} - -DENABLE_PYTHON_PLUGIN:BOOL=${ROBOTOLOGY_USES_PYTHON} - COMPONENT core - FOLDER robotology) - diff --git a/cmake/BuildRobotTestingFramework.cmake b/cmake/BuildRobotTestingFramework.cmake new file mode 100644 index 000000000..a30248c00 --- /dev/null +++ b/cmake/BuildRobotTestingFramework.cmake @@ -0,0 +1,15 @@ +# Copyright (C) 2017 iCub Facility, Istituto Italiano di Tecnologia +# Authors: Silvio Traversaro +# CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT + +include(YCMEPHelper) +include(FindOrBuildPackage) + +ycm_ep_helper(RobotTestingFramework TYPE GIT + STYLE GITHUB + REPOSITORY robotology/robot-testing-framework.git + CMAKE_ARGS -DENABLE_LUA_PLUGIN:BOOL=${ROBOTOLOGY_USES_LUA} + -DENABLE_PYTHON_PLUGIN:BOOL=${ROBOTOLOGY_USES_PYTHON} + COMPONENT core + FOLDER robotology) + diff --git a/cmake/BuildYARP.cmake b/cmake/BuildYARP.cmake index 9033cba4d..3a65cf489 100644 --- a/cmake/BuildYARP.cmake +++ b/cmake/BuildYARP.cmake @@ -8,7 +8,7 @@ include(FindOrBuildPackage) find_package(ACE QUIET) find_package(SQLite QUIET) find_package(Eigen3 QUIET) -find_or_build_package(RTF QUIET) +find_or_build_package(RobotTestingFramework QUIET) if(ROBOTOLOGY_USES_PYTHON) set(YARP_COMPILE_BINDINGS ON) @@ -26,7 +26,7 @@ ycm_ep_helper(YARP TYPE GIT ACE SQLite Eigen3 - RTF + RobotTestingFramework CMAKE_ARGS -DCREATE_IDLS:BOOL=ON -DCREATE_GUIS:BOOL=ON -DYARP_USE_SYSTEM_SQLITE:BOOL=ON diff --git a/cmake/Buildicub-tests.cmake b/cmake/Buildicub-tests.cmake index 879656e58..eae857090 100644 --- a/cmake/Buildicub-tests.cmake +++ b/cmake/Buildicub-tests.cmake @@ -5,8 +5,8 @@ include(YCMEPHelper) include(FindOrBuildPackage) +find_or_build_package(RobotTestingFramework QUIET) find_or_build_package(YARP QUIET) -find_or_build_package(RTF QUIET) find_or_build_package(ICUB QUIET) ycm_ep_helper(icub-tests TYPE GIT @@ -15,6 +15,6 @@ ycm_ep_helper(icub-tests TYPE GIT TAG master COMPONENT iCub FOLDER robotology - DEPENDS YARP - RTF + DEPENDS RobotTestingFramework + YARP ICUB) diff --git a/cmake/ProjectsTagsDevel.cmake b/cmake/ProjectsTagsDevel.cmake index dd33df746..f961ecf45 100644 --- a/cmake/ProjectsTagsDevel.cmake +++ b/cmake/ProjectsTagsDevel.cmake @@ -5,7 +5,7 @@ macro(set_tag tag_name tag_value) endmacro() set_tag(ICUB_TAG devel) -set_tag(RTF_TAG devel) +set_tag(RobotTestingFramework_TAG devel) set_tag(WBToolbox_TAG devel) set_tag(BlockFactory_TAG devel) set_tag(YARP_TAG devel) diff --git a/cmake/ProjectsTagsMaster.cmake b/cmake/ProjectsTagsMaster.cmake index e62e1cf4d..ea502aedb 100644 --- a/cmake/ProjectsTagsMaster.cmake +++ b/cmake/ProjectsTagsMaster.cmake @@ -2,6 +2,4 @@ macro(set_tag tag_name tag_value) if(NOT ${tag_name}) set(${tag_name} ${tag_value}) endif() -endmacro() - -set_tag(RTF_TAG v1.6.0) +endmacro() \ No newline at end of file