From 6009076f13f2108a076600fba5be770f674f518a Mon Sep 17 00:00:00 2001
From: Jacopo Bartiromo <jackbart94@gmail.com>
Date: Tue, 15 Oct 2019 18:51:49 +0200
Subject: [PATCH] minor changes to paths and cmakefile

---
 LibCarla/cmake/client/CMakeLists.txt             | 12 ++++++------
 .../carla/trafficmanager/BatchControlStage.h     |  4 ++--
 .../source/carla/trafficmanager/CollisionStage.h |  6 +++---
 .../source/carla/trafficmanager/InMemoryMap.h    |  2 +-
 .../carla/trafficmanager/LocalizationStage.h     | 12 ++++++------
 .../carla/trafficmanager/MessengerAndDataTypes.h |  4 ++--
 .../carla/trafficmanager/MotionPlannerStage.h    |  6 +++---
 LibCarla/source/carla/trafficmanager/Pipeline.h  | 16 ++++++++--------
 .../carla/trafficmanager/PipelineExecutable.cpp  |  5 +----
 .../source/carla/trafficmanager/PipelineStage.h  |  2 +-
 .../carla/trafficmanager/TrafficDistributor.h    |  4 ++--
 .../carla/trafficmanager/TrafficLightStage.h     |  4 ++--
 12 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/LibCarla/cmake/client/CMakeLists.txt b/LibCarla/cmake/client/CMakeLists.txt
index 2e7697ca8..e485bdadc 100644
--- a/LibCarla/cmake/client/CMakeLists.txt
+++ b/LibCarla/cmake/client/CMakeLists.txt
@@ -84,12 +84,6 @@ file(GLOB libcarla_carla_nav_sources
 set(libcarla_sources "${libcarla_sources};${libcarla_carla_nav_sources}")
 install(FILES ${libcarla_carla_nav_sources} DESTINATION include/carla/nav)
 
-file(GLOB libcarla_carla_trafficmanager_sources
-    "${libcarla_source_path}/carla/trafficmanager/*.cpp"
-    "${libcarla_source_path}/carla/trafficmanager/*.h")
-set(libcarla_sources "${libcarla_sources};${libcarla_carla_trafficmanager_sources}")
-install(FILES ${libcarla_carla_trafficmanager_sources} DESTINATION include/carla/trafficmanager)
-
 file(GLOB libcarla_carla_opendrive_sources
     "${libcarla_source_path}/carla/opendrive/*.cpp"
     "${libcarla_source_path}/carla/opendrive/*.h")
@@ -216,6 +210,12 @@ file(GLOB libcarla_pugixml_sources
 set(libcarla_sources "${libcarla_sources};${libcarla_pugixml_sources}")
 install(FILES ${libcarla_pugixml_sources} DESTINATION include/pugixml)
 
+file(GLOB libcarla_carla_trafficmanager_sources
+    "${libcarla_source_path}/carla/trafficmanager/*.cpp"
+    "${libcarla_source_path}/carla/trafficmanager/*.h")
+set(libcarla_sources "${libcarla_sources};${libcarla_carla_trafficmanager_sources}")
+install(FILES ${libcarla_carla_trafficmanager_sources} DESTINATION include/carla/trafficmanager)
+
 # ==============================================================================
 # Create targets for debug and release in the same build type.
 # ==============================================================================
diff --git a/LibCarla/source/carla/trafficmanager/BatchControlStage.h b/LibCarla/source/carla/trafficmanager/BatchControlStage.h
index 036ec18f3..324842da9 100644
--- a/LibCarla/source/carla/trafficmanager/BatchControlStage.h
+++ b/LibCarla/source/carla/trafficmanager/BatchControlStage.h
@@ -8,8 +8,8 @@
 #include "carla/rpc/Command.h"
 #include "carla/rpc/VehicleControl.h"
 
-#include "MessengerAndDataTypes.h"
-#include "PipelineStage.h"
+#include "carla/trafficmanager/MessengerAndDataTypes.h"
+#include "carla/trafficmanager/PipelineStage.h"
 
 namespace traffic_manager {
 
diff --git a/LibCarla/source/carla/trafficmanager/CollisionStage.h b/LibCarla/source/carla/trafficmanager/CollisionStage.h
index f1eb54561..7f4769264 100644
--- a/LibCarla/source/carla/trafficmanager/CollisionStage.h
+++ b/LibCarla/source/carla/trafficmanager/CollisionStage.h
@@ -20,9 +20,9 @@
 #include "carla/Logging.h"
 #include "carla/rpc/ActorId.h"
 
-#include "MessengerAndDataTypes.h"
-#include "PipelineStage.h"
-#include "VicinityGrid.h"
+#include "carla/trafficmanager/MessengerAndDataTypes.h"
+#include "carla/trafficmanager/PipelineStage.h"
+#include "carla/trafficmanager/VicinityGrid.h"
 
 namespace traffic_manager {
 
diff --git a/LibCarla/source/carla/trafficmanager/InMemoryMap.h b/LibCarla/source/carla/trafficmanager/InMemoryMap.h
index a3a4fa296..1d2927c12 100644
--- a/LibCarla/source/carla/trafficmanager/InMemoryMap.h
+++ b/LibCarla/source/carla/trafficmanager/InMemoryMap.h
@@ -11,7 +11,7 @@
 #include "carla/geom/Math.h"
 #include "carla/Memory.h"
 
-#include "SimpleWaypoint.h"
+#include "carla/trafficmanager/SimpleWaypoint.h"
 
 namespace traffic_manager {
 
diff --git a/LibCarla/source/carla/trafficmanager/LocalizationStage.h b/LibCarla/source/carla/trafficmanager/LocalizationStage.h
index 6971efe3b..5c19478ab 100644
--- a/LibCarla/source/carla/trafficmanager/LocalizationStage.h
+++ b/LibCarla/source/carla/trafficmanager/LocalizationStage.h
@@ -16,12 +16,12 @@
 #include "carla/Memory.h"
 #include "carla/rpc/ActorId.h"
 
-#include "AtomicActorSet.h"
-#include "InMemoryMap.h"
-#include "MessengerAndDataTypes.h"
-#include "PipelineStage.h"
-#include "SimpleWaypoint.h"
-#include "TrafficDistributor.h"
+#include "carla/trafficmanager/AtomicActorSet.h"
+#include "carla/trafficmanager/InMemoryMap.h"
+#include "carla/trafficmanager/MessengerAndDataTypes.h"
+#include "carla/trafficmanager/PipelineStage.h"
+#include "carla/trafficmanager/SimpleWaypoint.h"
+#include "carla/trafficmanager/TrafficDistributor.h"
 
 namespace traffic_manager {
 
diff --git a/LibCarla/source/carla/trafficmanager/MessengerAndDataTypes.h b/LibCarla/source/carla/trafficmanager/MessengerAndDataTypes.h
index e2f7c5528..2bf54246e 100644
--- a/LibCarla/source/carla/trafficmanager/MessengerAndDataTypes.h
+++ b/LibCarla/source/carla/trafficmanager/MessengerAndDataTypes.h
@@ -7,8 +7,8 @@
 #include "carla/Memory.h"
 #include "carla/rpc/ActorId.h"
 
-#include "Messenger.h"
-#include "SimpleWaypoint.h"
+#include "carla/trafficmanager/Messenger.h"
+#include "carla/trafficmanager/SimpleWaypoint.h"
 
 namespace traffic_manager {
 
diff --git a/LibCarla/source/carla/trafficmanager/MotionPlannerStage.h b/LibCarla/source/carla/trafficmanager/MotionPlannerStage.h
index 16002f700..285f313c1 100644
--- a/LibCarla/source/carla/trafficmanager/MotionPlannerStage.h
+++ b/LibCarla/source/carla/trafficmanager/MotionPlannerStage.h
@@ -7,9 +7,9 @@
 #include "carla/client/Vehicle.h"
 #include "carla/rpc/Actor.h"
 
-#include "MessengerAndDataTypes.h"
-#include "PIDController.h"
-#include "PipelineStage.h"
+#include "carla/trafficmanager/MessengerAndDataTypes.h"
+#include "carla/trafficmanager/PIDController.h"
+#include "carla/trafficmanager/PipelineStage.h"
 
 namespace traffic_manager {
 
diff --git a/LibCarla/source/carla/trafficmanager/Pipeline.h b/LibCarla/source/carla/trafficmanager/Pipeline.h
index 887d90e48..75c48b8ee 100644
--- a/LibCarla/source/carla/trafficmanager/Pipeline.h
+++ b/LibCarla/source/carla/trafficmanager/Pipeline.h
@@ -14,14 +14,14 @@
 #include "carla/Logging.h"
 #include "carla/Memory.h"
 
-#include "AtomicActorSet.h"
-#include "BatchControlStage.h"
-#include "CarlaDataAccessLayer.h"
-#include "CollisionStage.h"
-#include "InMemoryMap.h"
-#include "LocalizationStage.h"
-#include "MotionPlannerStage.h"
-#include "TrafficLightStage.h"
+#include "carla/trafficmanager/AtomicActorSet.h"
+#include "carla/trafficmanager/BatchControlStage.h"
+#include "carla/trafficmanager/CarlaDataAccessLayer.h"
+#include "carla/trafficmanager/CollisionStage.h"
+#include "carla/trafficmanager/InMemoryMap.h"
+#include "carla/trafficmanager/LocalizationStage.h"
+#include "carla/trafficmanager/MotionPlannerStage.h"
+#include "carla/trafficmanager/TrafficLightStage.h"
 
 namespace traffic_manager {
 
diff --git a/LibCarla/source/carla/trafficmanager/PipelineExecutable.cpp b/LibCarla/source/carla/trafficmanager/PipelineExecutable.cpp
index d36ad78df..b811732d7 100644
--- a/LibCarla/source/carla/trafficmanager/PipelineExecutable.cpp
+++ b/LibCarla/source/carla/trafficmanager/PipelineExecutable.cpp
@@ -8,14 +8,13 @@
 #include <stdexcept>
 #include <random>
 
-#include "boost/stacktrace.hpp"
 #include "carla/client/Client.h"
 #include "carla/client/TimeoutException.h"
 #include "carla/Logging.h"
 #include "carla/Memory.h"
 #include "carla/rpc/Command.h"
 
-#include "Pipeline.h"
+#include "carla/trafficmanager/Pipeline.h"
 
 static uint MINIMUM_NUMBER_OF_VEHICLES = 100u;
 
@@ -42,8 +41,6 @@ void handler() {
       }
     }
 
-    // Uncomment the below line if compiling with debug options (in CMakeLists.txt)
-    // std::cout << boost::stacktrace::stacktrace() << std::endl;
     exit(1);
   }
 }
diff --git a/LibCarla/source/carla/trafficmanager/PipelineStage.h b/LibCarla/source/carla/trafficmanager/PipelineStage.h
index 107258549..358de7a87 100644
--- a/LibCarla/source/carla/trafficmanager/PipelineStage.h
+++ b/LibCarla/source/carla/trafficmanager/PipelineStage.h
@@ -12,7 +12,7 @@
 
 #include "carla/rpc/ActorId.h"
 
-#include "Messenger.h"
+#include "carla/trafficmanager/Messenger.h"
 
 namespace traffic_manager {
 
diff --git a/LibCarla/source/carla/trafficmanager/TrafficDistributor.h b/LibCarla/source/carla/trafficmanager/TrafficDistributor.h
index 3c5e04f02..950f6bd98 100644
--- a/LibCarla/source/carla/trafficmanager/TrafficDistributor.h
+++ b/LibCarla/source/carla/trafficmanager/TrafficDistributor.h
@@ -11,8 +11,8 @@
 #include "carla/client/Vehicle.h"
 #include "carla/rpc/ActorId.h"
 
-#include "MessengerAndDataTypes.h"
-#include "SimpleWaypoint.h"
+#include "carla/trafficmanager/MessengerAndDataTypes.h"
+#include "carla/trafficmanager/SimpleWaypoint.h"
 
 namespace traffic_manager {
 
diff --git a/LibCarla/source/carla/trafficmanager/TrafficLightStage.h b/LibCarla/source/carla/trafficmanager/TrafficLightStage.h
index be3e5b4fb..de37c8779 100644
--- a/LibCarla/source/carla/trafficmanager/TrafficLightStage.h
+++ b/LibCarla/source/carla/trafficmanager/TrafficLightStage.h
@@ -10,8 +10,8 @@
 #include "carla/Memory.h"
 #include "carla/rpc/TrafficLightState.h"
 
-#include "MessengerAndDataTypes.h"
-#include "PipelineStage.h"
+#include "carla/trafficmanager/MessengerAndDataTypes.h"
+#include "carla/trafficmanager/PipelineStage.h"
 
 namespace traffic_manager {