From ff741fda68b8c8a53f81d5637406dfd5af41f15e Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@student.kit.edu>
Date: Thu, 15 Nov 2018 10:08:50 +0100
Subject: [PATCH] Moved tinyxml from Tools/ to Util/
---
VirtualRobot/CMakeLists.txt | 5 ++---
VirtualRobot/{Tools => Util/xml}/tinyxml2.cpp | 0
VirtualRobot/{Tools => Util/xml}/tinyxml2.h | 0
VirtualRobot/XML/mjcf/MjcfDocument.h | 2 +-
VirtualRobot/XML/mjcf/utils.h | 2 +-
5 files changed, 4 insertions(+), 5 deletions(-)
rename VirtualRobot/{Tools => Util/xml}/tinyxml2.cpp (100%)
rename VirtualRobot/{Tools => Util/xml}/tinyxml2.h (100%)
diff --git a/VirtualRobot/CMakeLists.txt b/VirtualRobot/CMakeLists.txt
index eac82c2b0..2b4ff8e30 100644
--- a/VirtualRobot/CMakeLists.txt
+++ b/VirtualRobot/CMakeLists.txt
@@ -151,7 +151,6 @@ Import/SimoxXMLFactory.cpp
Import/RobotImporterFactory.cpp
Import/MeshImport/STLReader.cpp
Tools/Gravity.cpp
-Tools/tinyxml2.cpp
math/Contact.cpp
math/ContactList.cpp
math/Line.cpp
@@ -187,6 +186,7 @@ math/Primitive.cpp
math/WeightedAverage.cpp
math/Grid3D.cpp
math/GridCacheFloat3.cpp
+Util/xml/tinyxml2.cpp
)
SET(INCLUDES
@@ -310,7 +310,6 @@ Import/SimoxXMLFactory.h
Import/RobotImporterFactory.h
Import/MeshImport/STLReader.h
Tools/Gravity.h
-Tools/tinyxml2.h
math/MathForwardDefinitions.h
math/Contact.h
math/ContactList.h
@@ -355,7 +354,7 @@ math/Primitive.h
math/Grid3D.h
math/GridCacheFloat3.h
math/WeightedAverage.h
-
+Util/xml/tinyxml2.h
)
if (Simox_USE_RBDL AND RBDL_FOUND)
diff --git a/VirtualRobot/Tools/tinyxml2.cpp b/VirtualRobot/Util/xml/tinyxml2.cpp
similarity index 100%
rename from VirtualRobot/Tools/tinyxml2.cpp
rename to VirtualRobot/Util/xml/tinyxml2.cpp
diff --git a/VirtualRobot/Tools/tinyxml2.h b/VirtualRobot/Util/xml/tinyxml2.h
similarity index 100%
rename from VirtualRobot/Tools/tinyxml2.h
rename to VirtualRobot/Util/xml/tinyxml2.h
diff --git a/VirtualRobot/XML/mjcf/MjcfDocument.h b/VirtualRobot/XML/mjcf/MjcfDocument.h
index a266ba22a..4b9239d6c 100644
--- a/VirtualRobot/XML/mjcf/MjcfDocument.h
+++ b/VirtualRobot/XML/mjcf/MjcfDocument.h
@@ -5,7 +5,7 @@
#include <Eigen/Eigen>
#include <VirtualRobot/Robot.h>
-#include <VirtualRobot/Tools/tinyxml2.h>
+#include <VirtualRobot/Util/xml/tinyxml2.h>
#include "utils.h"
diff --git a/VirtualRobot/XML/mjcf/utils.h b/VirtualRobot/XML/mjcf/utils.h
index 5f897f1c7..0adcb4b54 100644
--- a/VirtualRobot/XML/mjcf/utils.h
+++ b/VirtualRobot/XML/mjcf/utils.h
@@ -1,6 +1,6 @@
#pragma once
-#include <VirtualRobot/Tools/tinyxml2.h>
+#include <VirtualRobot/Util/xml/tinyxml2.h>
#include <string>
#include <Eigen/Eigen>
--
GitLab