From 5d8800fa903811febd7a8796cac8f1055296e85f Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Mon, 2 Mar 2020 10:30:46 +0100
Subject: [PATCH] Move JSON library to SimoxUtility

---
 SimoxUtility/CMakeLists.txt                            | 10 ++++++++++
 {VirtualRobot/Util => SimoxUtility}/json.h             |  5 +++--
 {VirtualRobot/Util => SimoxUtility}/json/LICENSE.MIT   |  0
 .../Util => SimoxUtility}/json/converters.cpp          |  0
 {VirtualRobot/Util => SimoxUtility}/json/converters.h  |  0
 .../Util => SimoxUtility}/json/eigen_conversion.cpp    |  0
 .../Util => SimoxUtility}/json/eigen_conversion.h      |  0
 {VirtualRobot/Util => SimoxUtility}/json/io.cpp        |  0
 {VirtualRobot/Util => SimoxUtility}/json/io.h          |  0
 {VirtualRobot/Util => SimoxUtility}/json/json.hpp      |  0
 VirtualRobot/Util/json/eigen_conversion.hpp            |  4 ----
 11 files changed, 13 insertions(+), 6 deletions(-)
 rename {VirtualRobot/Util => SimoxUtility}/json.h (77%)
 rename {VirtualRobot/Util => SimoxUtility}/json/LICENSE.MIT (100%)
 rename {VirtualRobot/Util => SimoxUtility}/json/converters.cpp (100%)
 rename {VirtualRobot/Util => SimoxUtility}/json/converters.h (100%)
 rename {VirtualRobot/Util => SimoxUtility}/json/eigen_conversion.cpp (100%)
 rename {VirtualRobot/Util => SimoxUtility}/json/eigen_conversion.h (100%)
 rename {VirtualRobot/Util => SimoxUtility}/json/io.cpp (100%)
 rename {VirtualRobot/Util => SimoxUtility}/json/io.h (100%)
 rename {VirtualRobot/Util => SimoxUtility}/json/json.hpp (100%)
 delete mode 100644 VirtualRobot/Util/json/eigen_conversion.hpp

diff --git a/SimoxUtility/CMakeLists.txt b/SimoxUtility/CMakeLists.txt
index e43fcf286..ddb40a690 100644
--- a/SimoxUtility/CMakeLists.txt
+++ b/SimoxUtility/CMakeLists.txt
@@ -46,6 +46,10 @@ MESSAGE (STATUS "\n***** CONFIGURING Simox project SimoxUtility *****")
 #################################### FILES ##################################
 SET(SOURCES
     SimoxUtility.cpp
+
+    json/eigen_conversion.cpp
+    json/io.cpp
+    json/converters.cpp
 )
 
 SET(INCLUDES
@@ -105,6 +109,12 @@ SET(INCLUDES
     math/distance/angle_between.h
 
     math/periodic_clamp.h
+
+    json.h
+    json/converters.h
+    json/eigen_conversion.h
+    json/io.h
+    json/json.hpp
 )
 
 simox_generate_subdir_headers(
diff --git a/VirtualRobot/Util/json.h b/SimoxUtility/json.h
similarity index 77%
rename from VirtualRobot/Util/json.h
rename to SimoxUtility/json.h
index 5fafc05cf..f3ef91d4b 100644
--- a/VirtualRobot/Util/json.h
+++ b/SimoxUtility/json.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "json/json.hpp"
+// This file is generated!
+
+#include "json/converters.h"
 #include "json/eigen_conversion.h"
 #include "json/io.h"
-#include "json/converters.h"
diff --git a/VirtualRobot/Util/json/LICENSE.MIT b/SimoxUtility/json/LICENSE.MIT
similarity index 100%
rename from VirtualRobot/Util/json/LICENSE.MIT
rename to SimoxUtility/json/LICENSE.MIT
diff --git a/VirtualRobot/Util/json/converters.cpp b/SimoxUtility/json/converters.cpp
similarity index 100%
rename from VirtualRobot/Util/json/converters.cpp
rename to SimoxUtility/json/converters.cpp
diff --git a/VirtualRobot/Util/json/converters.h b/SimoxUtility/json/converters.h
similarity index 100%
rename from VirtualRobot/Util/json/converters.h
rename to SimoxUtility/json/converters.h
diff --git a/VirtualRobot/Util/json/eigen_conversion.cpp b/SimoxUtility/json/eigen_conversion.cpp
similarity index 100%
rename from VirtualRobot/Util/json/eigen_conversion.cpp
rename to SimoxUtility/json/eigen_conversion.cpp
diff --git a/VirtualRobot/Util/json/eigen_conversion.h b/SimoxUtility/json/eigen_conversion.h
similarity index 100%
rename from VirtualRobot/Util/json/eigen_conversion.h
rename to SimoxUtility/json/eigen_conversion.h
diff --git a/VirtualRobot/Util/json/io.cpp b/SimoxUtility/json/io.cpp
similarity index 100%
rename from VirtualRobot/Util/json/io.cpp
rename to SimoxUtility/json/io.cpp
diff --git a/VirtualRobot/Util/json/io.h b/SimoxUtility/json/io.h
similarity index 100%
rename from VirtualRobot/Util/json/io.h
rename to SimoxUtility/json/io.h
diff --git a/VirtualRobot/Util/json/json.hpp b/SimoxUtility/json/json.hpp
similarity index 100%
rename from VirtualRobot/Util/json/json.hpp
rename to SimoxUtility/json/json.hpp
diff --git a/VirtualRobot/Util/json/eigen_conversion.hpp b/VirtualRobot/Util/json/eigen_conversion.hpp
deleted file mode 100644
index 9bbfe4945..000000000
--- a/VirtualRobot/Util/json/eigen_conversion.hpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-// historical "alias header"
-#include "eigen_conversion.h"
-- 
GitLab