From 0327df1fd5f88fb401f8a51198bcd3b5f90a01ab Mon Sep 17 00:00:00 2001
From: Blyron <53337103+Blyron@users.noreply.github.com>
Date: Wed, 22 May 2024 16:22:45 +0200
Subject: [PATCH] aaron/cmakecleanupdate (#7685)

---
 Unreal/CMakeLists.txt | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/Unreal/CMakeLists.txt b/Unreal/CMakeLists.txt
index 99161eb8e..120d407e5 100644
--- a/Unreal/CMakeLists.txt
+++ b/Unreal/CMakeLists.txt
@@ -39,6 +39,11 @@ set (
   ${CARLA_UE_PLUGINS_PATH}/CarlaTools
 )
 
+set (
+  CARLA_UE_CARLA_EXPORTER_PATH
+  ${CARLA_UE_PLUGINS_PATH}/CarlaExporter
+)
+
 set (
   CARLA_UE_PROJECT_PATH
   ${CARLA_UE_PATH}/CarlaUnreal.uproject
@@ -312,7 +317,7 @@ carla_add_custom_target (
   carla-unreal
   "Build the CarlaUnreal subproject."
   COMMAND
-    ${CARLA_UE_BUILD_COMMAND_PREFIX} 
+    ${CARLA_UE_BUILD_COMMAND_PREFIX}
     CarlaUnreal
     ${UE_SYSTEM_NAME}
     ${CARLA_UNREAL_BUILD_TYPE}
@@ -334,7 +339,7 @@ carla_add_custom_target (
   carla-unreal-editor
   "Build the CarlaUnrealEditor subproject."
   COMMAND
-    ${CARLA_UE_BUILD_COMMAND_PREFIX} 
+    ${CARLA_UE_BUILD_COMMAND_PREFIX}
     CarlaUnrealEditor
     ${UE_SYSTEM_NAME}
     ${CARLA_UNREAL_BUILD_TYPE}
@@ -512,17 +517,24 @@ add_dependencies (
 )
 
 set_property (
-  DIRECTORY APPEND PROPERTY ADDITIONAL_CLEAN_FILES  
-  "${CARLA_UE_PATH}/Binaries" 
+  DIRECTORY APPEND PROPERTY ADDITIONAL_CLEAN_FILES
+  "${CARLA_UE_PATH}/Binaries"
+  "${CARLA_UE_PATH}/Build"
+  "${CARLA_UE_PATH}/DerivedDataCache"
   "${CARLA_UE_PATH}/Intermediate"
   "${CARLA_UE_PATH}/Saved"
-  "${CARLA_UE_CARLA_TOOLS_PATH}/Binaries" 
+  "${CARLA_UE_CARLA_TOOLS_PATH}/Binaries"
   "${CARLA_UE_CARLA_TOOLS_PATH}/Intermediate"
   "${CARLA_UE_CARLA_TOOLS_PATH}/Saved"
-  "${CARLA_UE_CARLA_PATH}/Binaries" 
+  "${CARLA_UE_CARLA_EXPORTER_PATH}/Binaries"
+  "${CARLA_UE_CARLA_EXPORTER_PATH}/Intermediate"
+  "${CARLA_UE_CARLA_EXPORTER_PATH}/Saved"
+  "${CARLA_UE_CARLA_PATH}/Binaries"
   "${CARLA_UE_CARLA_PATH}/Intermediate"
   "${CARLA_UE_CARLA_PATH}/Saved"
+  "${CARLA_UE_PLUGINS_PATH}/StreetMap/Binaries"
+  "${CARLA_UE_PLUGINS_PATH}/StreetMap/Intermediate"
+  "${CARLA_UE_PLUGINS_PATH}/StreetMap/Saved"
   "${CARLA_BUILD_PATH}/Package"
   "${CARLA_BUILD_PATH}/PythonAPI/dist"
 )
-