From 4abd314a626934f7457f9795a2c5d68509ed0451 Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <silvio@traversaro.it>
Date: Fri, 6 Dec 2024 14:27:25 +0100
Subject: [PATCH] Do not link idyntree-modelio-urdf but link idyntree-modelio
 and update ModelIO header inclusions

---
 toolbox/base/CMakeLists.txt               | 2 +-
 toolbox/base/src/RobotInterface.cpp       | 2 +-
 toolbox/library/CMakeLists.txt            | 2 +-
 toolbox/library/src/InverseKinematics.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/toolbox/base/CMakeLists.txt b/toolbox/base/CMakeLists.txt
index 8eb4c15b2..4376f1d8f 100644
--- a/toolbox/base/CMakeLists.txt
+++ b/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
diff --git a/toolbox/base/src/RobotInterface.cpp b/toolbox/base/src/RobotInterface.cpp
index 80a28b0b3..db995066a 100644
--- a/toolbox/base/src/RobotInterface.cpp
+++ b/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>
diff --git a/toolbox/library/CMakeLists.txt b/toolbox/library/CMakeLists.txt
index aeba0b852..d0784adf8 100644
--- a/toolbox/library/CMakeLists.txt
+++ b/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
diff --git a/toolbox/library/src/InverseKinematics.cpp b/toolbox/library/src/InverseKinematics.cpp
index 031ae8d86..4ad5c0d9d 100644
--- a/toolbox/library/src/InverseKinematics.cpp
+++ b/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>