From bfa58f290271e432abf2d3cf0e66033318094649 Mon Sep 17 00:00:00 2001
From: Marcel Pi <25649656+MarcelPiNacy@users.noreply.github.com>
Date: Mon, 18 Mar 2024 20:25:56 +0100
Subject: [PATCH] Multiple minor changes.

---
 CMake/Options/Common.cmake |  6 ++++++
 Import/README.md           |  2 +-
 LibCarla/CMakeLists.txt    | 40 ++++++++++++++++++++++----------------
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/CMake/Options/Common.cmake b/CMake/Options/Common.cmake
index 96eeb18a9..4d35360e4 100644
--- a/CMake/Options/Common.cmake
+++ b/CMake/Options/Common.cmake
@@ -26,6 +26,12 @@ option (
   ON
 )
 
+option (
+  BUILD_LIBCARLA_TESTS
+  "Build LibCarla tests."
+  ON
+)
+
 option (
   ENABLE_PYTORCH
   "Enable PyTorch for CARLA."
diff --git a/Import/README.md b/Import/README.md
index 881c68578..b2caed961 100644
--- a/Import/README.md
+++ b/Import/README.md
@@ -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/)
diff --git a/LibCarla/CMakeLists.txt b/LibCarla/CMakeLists.txt
index 2faf626a7..5b39296bb 100644
--- a/LibCarla/CMakeLists.txt
+++ b/LibCarla/CMakeLists.txt
@@ -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 (