Do not link idyntree-modelio-urdf but link idyntree-modelio and update ModelIO header inclusions

Author: traversaro

toolbox/base/CMakeLists.txt

@@ -24,7 +24,7 @@ target_link_libraries(WBToolboxBase
     YARP::YARP_init
     YARP::YARP_dev
     iDynTree::idyntree-model
-    iDynTree::idyntree-modelio-urdf
+    iDynTree::idyntree-modelio
     iDynTree::idyntree-high-level)
 
 target_include_directories(WBToolboxBase PUBLIC

toolbox/base/src/RobotInterface.cpp

@@ -14,7 +14,7 @@
 #include <iDynTree/FreeFloatingMatrices.h>
 #include <iDynTree/Indices.h>
 #include <iDynTree/Model.h>
-#include <iDynTree/ModelIO/ModelLoader.h>
+#include <iDynTree/ModelLoader.h>
 #include <yarp/dev/ControlBoardInterfaces.h>
 #include <yarp/dev/PolyDriver.h>
 #include <yarp/os/Bottle.h>

toolbox/library/CMakeLists.txt

@@ -101,7 +101,7 @@ list(APPEND WBTOOLBOXLIBRARY_EXT_LIBRARIES
     YARP::YARP_math
     iDynTree::idyntree-core
     iDynTree::idyntree-model
-    iDynTree::idyntree-modelio-urdf
+    iDynTree::idyntree-modelio
     iDynTree::idyntree-high-level)
 
 # Additional dependency of the SimulatorSynchronizer block

toolbox/library/src/InverseKinematics.cpp

@@ -8,7 +8,7 @@
 #include <iCub/iKin/iKinFwd.h>
 #include <iCub/iKin/iKinIpOpt.h>
 #include <iDynTree/DenavitHartenberg.h>
-#include <iDynTree/ModelIO/ModelLoader.h>
+#include <iDynTree/ModelLoader.h>
 #include <iDynTree/iKinConversions.h>
 #include <wbi/wholeBodyInterface.h>
 #include <yarp/os/ResourceFinder.h>