Skip to content

Commit 6f52ead

Browse files
traversarotraversaro
authored
Merge pull request #249 from robotology/solveidyntreedeprecations
Remove warnings from configuration and compilation
2 parents 498f488 + d602ad7 commit 6f52ead

17 files changed

+51
-51
lines changed

‎.github/CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ Example:
6060
#include "RobotInterface.h"
6161
#include "Signal.h"
6262

63-
#include <iDynTree/Core/EigenHelpers.h>
64-
#include <iDynTree/Core/SpatialMomentum.h>
63+
#include <iDynTree/EigenHelpers.h>
64+
#include <iDynTree/SpatialMomentum.h>
6565
#include <iDynTree/KinDynComputations.h>
6666

6767
#include <ostream>

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This software may be modified and distributed under the terms of the
33
# GNU Lesser General Public License v2.1 or any later version.
44

5-
cmake_minimum_required(VERSION 3.5)
5+
cmake_minimum_required(VERSION 3.16)
66
project(WB-Toolbox LANGUAGES CXX VERSION 6.0.0)
77

88
if(WBT_BUILD_DOCS)

‎toolbox/base/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ target_link_libraries(WBToolboxBase
2424
YARP::YARP_init
2525
YARP::YARP_dev
2626
iDynTree::idyntree-model
27-
iDynTree::idyntree-modelio-urdf
27+
iDynTree::idyntree-modelio
2828
iDynTree::idyntree-high-level)
2929

3030
target_include_directories(WBToolboxBase PUBLIC

‎toolbox/base/src/RobotInterface.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
#include <BlockFactory/Core/Log.h>
1313
#include <iDynTree/KinDynComputations.h>
14-
#include <iDynTree/Model/FreeFloatingMatrices.h>
15-
#include <iDynTree/Model/Indices.h>
16-
#include <iDynTree/Model/Model.h>
17-
#include <iDynTree/ModelIO/ModelLoader.h>
14+
#include <iDynTree/FreeFloatingMatrices.h>
15+
#include <iDynTree/Indices.h>
16+
#include <iDynTree/Model.h>
17+
#include <iDynTree/ModelLoader.h>
1818
#include <yarp/dev/ControlBoardInterfaces.h>
1919
#include <yarp/dev/PolyDriver.h>
2020
#include <yarp/os/Bottle.h>

‎toolbox/base/src/WBBlock.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
#include <BlockFactory/Core/Parameter.h>
1717
#include <BlockFactory/Core/Signal.h>
1818
#include <Eigen/Core>
19-
#include <iDynTree/Core/EigenHelpers.h>
20-
#include <iDynTree/Core/Transform.h>
21-
#include <iDynTree/Core/Twist.h>
22-
#include <iDynTree/Core/VectorDynSize.h>
23-
#include <iDynTree/Core/VectorFixSize.h>
19+
#include <iDynTree/EigenHelpers.h>
20+
#include <iDynTree/Transform.h>
21+
#include <iDynTree/Twist.h>
22+
#include <iDynTree/VectorDynSize.h>
23+
#include <iDynTree/VectorFixSize.h>
2424
#include <iDynTree/KinDynComputations.h>
2525

2626
#include <array>

‎toolbox/library/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ list(APPEND WBTOOLBOXLIBRARY_EXT_LIBRARIES
101101
YARP::YARP_math
102102
iDynTree::idyntree-core
103103
iDynTree::idyntree-model
104-
iDynTree::idyntree-modelio-urdf
104+
iDynTree::idyntree-modelio
105105
iDynTree::idyntree-high-level)
106106

107107
# Additional dependency of the SimulatorSynchronizer block

‎toolbox/library/src/CentroidalMomentum.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#include <BlockFactory/Core/BlockInformation.h>
1414
#include <BlockFactory/Core/Log.h>
1515
#include <BlockFactory/Core/Signal.h>
16-
#include <iDynTree/Core/EigenHelpers.h>
17-
#include <iDynTree/Core/SpatialMomentum.h>
16+
#include <iDynTree/EigenHelpers.h>
17+
#include <iDynTree/SpatialMomentum.h>
1818
#include <iDynTree/KinDynComputations.h>
1919

2020
#include <ostream>

‎toolbox/library/src/CentroidalTotalMomentumMatrix.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
#include <BlockFactory/Core/Parameters.h>
1717
#include <BlockFactory/Core/Signal.h>
1818
#include <Eigen/Core>
19-
#include <iDynTree/Core/EigenHelpers.h>
20-
#include <iDynTree/Core/MatrixDynSize.h>
21-
#include <iDynTree/Core/Transform.h>
19+
#include <iDynTree/EigenHelpers.h>
20+
#include <iDynTree/MatrixDynSize.h>
21+
#include <iDynTree/Transform.h>
2222
#include <iDynTree/KinDynComputations.h>
23-
#include <iDynTree/Model/Indices.h>
23+
#include <iDynTree/Indices.h>
2424

2525
#include <memory>
2626
#include <ostream>

‎toolbox/library/src/DotJNu.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
#include <BlockFactory/Core/Parameter.h>
1616
#include <BlockFactory/Core/Parameters.h>
1717
#include <BlockFactory/Core/Signal.h>
18-
#include <iDynTree/Core/EigenHelpers.h>
19-
#include <iDynTree/Core/VectorFixSize.h>
18+
#include <iDynTree/EigenHelpers.h>
19+
#include <iDynTree/VectorFixSize.h>
2020
#include <iDynTree/KinDynComputations.h>
21-
#include <iDynTree/Model/Indices.h>
21+
#include <iDynTree/Indices.h>
2222

2323
#include <memory>
2424
#include <ostream>

‎toolbox/library/src/ForwardKinematics.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
#include <BlockFactory/Core/Parameters.h>
1717
#include <BlockFactory/Core/Signal.h>
1818
#include <Eigen/Core>
19-
#include <iDynTree/Core/EigenHelpers.h>
20-
#include <iDynTree/Core/Transform.h>
19+
#include <iDynTree/EigenHelpers.h>
20+
#include <iDynTree/Transform.h>
2121
#include <iDynTree/KinDynComputations.h>
22-
#include <iDynTree/Model/Indices.h>
22+
#include <iDynTree/Indices.h>
2323

2424
#include <ostream>
2525
#include <tuple>

0 commit comments

Comments
 (0)