p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor changes to paths and cmakefile

This commit is contained in:
Jacopo Bartiromo 2019-10-15 18:51:49 +02:00 committed by bernat
parent a22d9c09ae
commit 6009076f13
12 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LibCarla/cmake/client/CMakeLists.txt
View File

@ -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.
# ==============================================================================

4
LibCarla/source/carla/trafficmanager/BatchControlStage.h
View File

@ -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 {

6
LibCarla/source/carla/trafficmanager/CollisionStage.h
View File

@ -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 {

2
LibCarla/source/carla/trafficmanager/InMemoryMap.h
View File

@ -11,7 +11,7 @@
#include "carla/geom/Math.h"
#include "carla/Memory.h"
#include "SimpleWaypoint.h"
#include "carla/trafficmanager/SimpleWaypoint.h"
namespace traffic_manager {

12
LibCarla/source/carla/trafficmanager/LocalizationStage.h
View File

@ -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 {

4
LibCarla/source/carla/trafficmanager/MessengerAndDataTypes.h
View File

@ -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 {

6
LibCarla/source/carla/trafficmanager/MotionPlannerStage.h
View File

@ -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 {

16
LibCarla/source/carla/trafficmanager/Pipeline.h
View File

@ -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 {

5
LibCarla/source/carla/trafficmanager/PipelineExecutable.cpp
View File

@ -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);
}
}

2
LibCarla/source/carla/trafficmanager/PipelineStage.h
View File

@ -12,7 +12,7 @@
#include "carla/rpc/ActorId.h"
#include "Messenger.h"
#include "carla/trafficmanager/Messenger.h"
namespace traffic_manager {

4
LibCarla/source/carla/trafficmanager/TrafficDistributor.h
View File

@ -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 {

4
LibCarla/source/carla/trafficmanager/TrafficLightStage.h
View File

@ -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 {