Simplify UE targets.

CMake/Options/Common.cmake

@@ -107,7 +107,7 @@ option (
 carla_string_option (
   LIBCARLA_IMAGE_SUPPORTED_FORMATS
   "Semicolon-separated list of supported image formats by LibCarla. Available formats: png, jpeg, tiff"
-  "png"
+  png
 )
 
 carla_string_option (  

CMake/Options/Unreal.cmake

@@ -25,7 +25,7 @@ cmake_path (
 carla_string_option (
   CARLA_UNREAL_ENGINE_PATH
   "Path to the CARLA fork of Unreal Engine."
-  "${CARLA_UNREAL_ENGINE_PATH_INFERRED}"
+  ${CARLA_UNREAL_ENGINE_PATH_INFERRED}
 )
 
 carla_message ("Using ${CARLA_UNREAL_ENGINE_PATH} as Unreal Engine root path.")
@@ -51,7 +51,7 @@ endif ()
 carla_string_option (
   CARLA_UNREAL_RHI
   "Target CARLA Unreal Engine RHI."
-  "${CARLA_UNREAL_RHI_DEFAULT}"
+  ${CARLA_UNREAL_RHI_DEFAULT}
 )
 
 if (${BUILD_CARLA_UNREAL} AND ${CARLA_HAS_UNREAL_ENGINE_PATH})
@@ -72,3 +72,9 @@ carla_string_option (
   "when launching the Unreal Editor with CARLA."
   ""
 )
+
+carla_string_option (
+  CARLA_UNREAL_BUILD_TYPE
+  "Carla Unreal-style build type (Debug/Development/Shipping)."
+  Development
+)

Unreal/CMakeLists.txt

@@ -228,7 +228,7 @@ add_custom_command (
   COMMAND ${CMAKE_COMMAND} -E echo "${CARLA_UNREAL_OPTIONS}" >> ${CARLA_UNREAL_OPTIONS_PATHS_FILE_PATH}
   COMMAND ${CMAKE_COMMAND} -E create_symlink ${CARLA_UNREAL_OPTIONS_PATHS_FILE_PATH} ${CARLA_UE_CARLA_PATH}/Options.def
   COMMAND ${CMAKE_COMMAND} -E create_symlink ${CARLA_UNREAL_OPTIONS_PATHS_FILE_PATH} ${CARLA_UE_CARLA_TOOLS_PATH}/Options.def
-  
+
   USES_TERMINAL
   VERBATIM
 )
@@ -248,128 +248,18 @@ file (
 
 
 
-add_custom_target (
-  CarlaUnreal-${UE_SYSTEM_NAME}-Debug
-  COMMAND
-    ${CARLA_UE_BUILD_COMMAND_PREFIX} 
-    CarlaUnreal
-    ${UE_SYSTEM_NAME}
-    Debug
-    -project=${CARLA_UE_PROJECT_PATH}
-    -game
-    -buildscw
-  USES_TERMINAL
-  VERBATIM
-)
-
-add_custom_target (
-  CarlaUnreal-${UE_SYSTEM_NAME}-DebugGame
-  COMMAND
-    ${CARLA_UE_BUILD_COMMAND_PREFIX} 
-    CarlaUnreal
-    ${UE_SYSTEM_NAME}
-    DebugGame
-    -project=${CARLA_UE_PROJECT_PATH}
-    -game
-    -buildscw
-  USES_TERMINAL
-  VERBATIM
-)
-
-add_custom_target (
-  CarlaUnreal-${UE_SYSTEM_NAME}-Test
-  COMMAND
-    ${CARLA_UE_BUILD_COMMAND_PREFIX} 
-    CarlaUnreal
-    ${UE_SYSTEM_NAME}
-    Test
-    -project=${CARLA_UE_PROJECT_PATH}
-    -game
-    -buildscw
-  USES_TERMINAL
-  VERBATIM
-)
-
-add_custom_target (
-  CarlaUnreal-${UE_SYSTEM_NAME}-Shipping
-  COMMAND
-    ${CARLA_UE_BUILD_COMMAND_PREFIX}
-    CarlaUnreal
-    ${UE_SYSTEM_NAME}
-    Shipping
-    -project=${CARLA_UE_PROJECT_PATH}
-    -game
-    -buildscw
-  USES_TERMINAL
-  VERBATIM
-)
-
 add_custom_target (
   CarlaUnreal
   COMMAND
     ${CARLA_UE_BUILD_COMMAND_PREFIX} 
     CarlaUnreal
     ${UE_SYSTEM_NAME}
-    Development
-    -project=${CARLA_UE_PROJECT_PATH}
-    -game
-    -buildscw
-  USES_TERMINAL
-  VERBATIM
-)
-
-add_custom_target (
-  CarlaUnrealEditor-${UE_SYSTEM_NAME}-Debug
-  COMMAND
-    ${CARLA_UE_BUILD_COMMAND_PREFIX} 
-    CarlaUnrealEditor
-    ${UE_SYSTEM_NAME}
-    Debug
-    -project=${CARLA_UE_PROJECT_PATH}
-    -game
-    -buildscw
-  USES_TERMINAL
-  VERBATIM
-)
-
-add_custom_target (
-  CarlaUnrealEditor-${UE_SYSTEM_NAME}-DebugGame
-  COMMAND
-    ${CARLA_UE_BUILD_COMMAND_PREFIX} 
-    CarlaUnrealEditor
-    ${UE_SYSTEM_NAME}
-    DebugGame
-    -project=${CARLA_UE_PROJECT_PATH}
-    -game
-    -buildscw
-  USES_TERMINAL
-  VERBATIM
-)
-
-add_custom_target (
-  CarlaUnrealEditor-${UE_SYSTEM_NAME}-Test
-  COMMAND
-    ${CARLA_UE_BUILD_COMMAND_PREFIX} 
-    CarlaUnrealEditor
-    ${UE_SYSTEM_NAME}
-    Test
-    -project=${CARLA_UE_PROJECT_PATH}
-    -game
-    -buildscw
-  USES_TERMINAL
-  VERBATIM
-)
-
-add_custom_target (
-  CarlaUnrealEditor-${UE_SYSTEM_NAME}-Shipping
-  COMMAND
-    ${CARLA_UE_BUILD_COMMAND_PREFIX} 
-    CarlaUnrealEditor
-    ${UE_SYSTEM_NAME}
-    Shipping
+    ${CARLA_UNREAL_BUILD_TYPE}
     -project=${CARLA_UE_PROJECT_PATH}
     -game
     -buildscw
+  DEPENDS
+    ${CARLA_UNREAL_CONFIGURE_OUTPUTS}
   USES_TERMINAL
   VERBATIM
 )
@@ -380,25 +270,16 @@ add_custom_target (
     ${CARLA_UE_BUILD_COMMAND_PREFIX} 
     CarlaUnrealEditor
     ${UE_SYSTEM_NAME}
-    Development
+    ${CARLA_UNREAL_BUILD_TYPE}
     -project=${CARLA_UE_PROJECT_PATH}
     -game
     -buildscw
+  DEPENDS
+    ${CARLA_UNREAL_CONFIGURE_OUTPUTS}
   USES_TERMINAL
   VERBATIM
 )
 
-add_dependencies (CarlaUnreal-${UE_SYSTEM_NAME}-Debug carla-unreal-configure)
-add_dependencies (CarlaUnreal-${UE_SYSTEM_NAME}-DebugGame carla-unreal-configure)
-add_dependencies (CarlaUnreal-${UE_SYSTEM_NAME}-Test carla-unreal-configure)
-add_dependencies (CarlaUnreal-${UE_SYSTEM_NAME}-Shipping carla-unreal-configure)
-add_dependencies (CarlaUnreal carla-unreal-configure)
-add_dependencies (CarlaUnrealEditor-${UE_SYSTEM_NAME}-Debug carla-unreal-configure)
-add_dependencies (CarlaUnrealEditor-${UE_SYSTEM_NAME}-DebugGame carla-unreal-configure)
-add_dependencies (CarlaUnrealEditor-${UE_SYSTEM_NAME}-Test carla-unreal-configure)
-add_dependencies (CarlaUnrealEditor-${UE_SYSTEM_NAME}-Shipping carla-unreal-configure)
-add_dependencies (CarlaUnrealEditor carla-unreal-configure)
-
 
 
 set (