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

Multiple minor changes.

This commit is contained in:
Marcel Pi 2024-03-18 20:25:56 +01:00
parent 1621521610
commit bfa58f2902
3 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMake/Options/Common.cmake
View File

@ -26,6 +26,12 @@ option (
ON
)
option (
BUILD_LIBCARLA_TESTS
"Build LibCarla tests."
ON
)
option (
ENABLE_PYTORCH
"Enable PyTorch for CARLA."

2
Import/README.md
View File

@ -1,4 +1,4 @@
CARLA Simulator
===============
Please, place all the packages containing props and maps tom import in this folder. For more information, see topic [Creating standalone asset packages for distribution](https://carla.readthedocs.io/en/latest/asset_packages_for_dist/)
Please, place all the packages containing props and maps to import in this folder. For more information, see topic [Creating standalone asset packages for distribution](https://carla.readthedocs.io/en/latest/asset_packages_for_dist/)

40
LibCarla/CMakeLists.txt
View File

@ -1,18 +1,23 @@
set (LIBCARLA_SOURCE_PATH ${CARLA_WORKSPACE_PATH}/LibCarla/source)
set (LIBCARLA_THIRD_PARTY_SOURCE_PATH ${LIBCARLA_SOURCE_PATH}/third-party)
set (
LIBCARLA_SOURCE_PATH
${CARLA_WORKSPACE_PATH}/LibCarla/source
)
set (CARLA_PYTHON_VERSION_MAJOR 3)
set (CARLA_PYTHON_VERSION_MINOR 8)
set (
LIBCARLA_THIRD_PARTY_SOURCE_PATH
${LIBCARLA_SOURCE_PATH}/third-party
)
carla_two_step_configure_file (
${LIBCARLA_SOURCE_PATH}/carla/Version.h
${LIBCARLA_SOURCE_PATH}/carla/Version.h.in
)
set (CARLA_RTTI_DEFINITIONS)
set (
CARLA_RTTI_DEFINITIONS
)
if (ENABLE_RTTI)
else ()
if (NOT ENABLE_RTTI)
list (
APPEND
CARLA_RTTI_DEFINITIONS
@ -49,6 +54,7 @@ if (BUILD_CARLA_SERVER)
${LIBCARLA_SOURCE_PATH}/carla/streaming/detail/tcp/*.cpp
${LIBCARLA_SOURCE_PATH}/carla/multigpu/*.cpp
)
if (ENABLE_ROS2)
file (
GLOB
@ -251,16 +257,16 @@ if (BUILD_CARLA_CLIENT)
)
if (ENABLE_RSS)
file (
GLOB
LIBCARLA_CLIENT_SOURCES_RSS
${LIBCARLA_SOURCE_PATH}/carla/rss/*.cpp
)
list (
APPEND
LIBCARLA_CLIENT_SOURCES
${LIBCARLA_CLIENT_SOURCES_RSS}
)
file (
GLOB
LIBCARLA_CLIENT_SOURCES_RSS
${LIBCARLA_SOURCE_PATH}/carla/rss/*.cpp
)
list (
APPEND
LIBCARLA_CLIENT_SOURCES
${LIBCARLA_CLIENT_SOURCES_RSS}
)
endif ()
file (