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

aaron/cmakecleanupdate (#7685)

This commit is contained in:
Blyron 2024-05-22 16:22:45 +02:00 committed by GitHub
parent a3cc59ecc3
commit 0327df1fd5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Unreal/CMakeLists.txt
View File

@ -39,6 +39,11 @@ set (
${CARLA_UE_PLUGINS_PATH}/CarlaTools ${CARLA_UE_PLUGINS_PATH}/CarlaTools
) )
set (
CARLA_UE_CARLA_EXPORTER_PATH
${CARLA_UE_PLUGINS_PATH}/CarlaExporter
)
set ( set (
CARLA_UE_PROJECT_PATH CARLA_UE_PROJECT_PATH
${CARLA_UE_PATH}/CarlaUnreal.uproject ${CARLA_UE_PATH}/CarlaUnreal.uproject
@ -312,7 +317,7 @@ carla_add_custom_target (
carla-unreal carla-unreal
"Build the CarlaUnreal subproject." "Build the CarlaUnreal subproject."
COMMAND COMMAND
${CARLA_UE_BUILD_COMMAND_PREFIX} ${CARLA_UE_BUILD_COMMAND_PREFIX}
CarlaUnreal CarlaUnreal
${UE_SYSTEM_NAME} ${UE_SYSTEM_NAME}
${CARLA_UNREAL_BUILD_TYPE} ${CARLA_UNREAL_BUILD_TYPE}
@ -334,7 +339,7 @@ carla_add_custom_target (
carla-unreal-editor carla-unreal-editor
"Build the CarlaUnrealEditor subproject." "Build the CarlaUnrealEditor subproject."
COMMAND COMMAND
${CARLA_UE_BUILD_COMMAND_PREFIX} ${CARLA_UE_BUILD_COMMAND_PREFIX}
CarlaUnrealEditor CarlaUnrealEditor
${UE_SYSTEM_NAME} ${UE_SYSTEM_NAME}
${CARLA_UNREAL_BUILD_TYPE} ${CARLA_UNREAL_BUILD_TYPE}
@ -512,17 +517,24 @@ add_dependencies (
) )
set_property ( set_property (
DIRECTORY APPEND PROPERTY ADDITIONAL_CLEAN_FILES DIRECTORY APPEND PROPERTY ADDITIONAL_CLEAN_FILES
"${CARLA_UE_PATH}/Binaries" "${CARLA_UE_PATH}/Binaries"
"${CARLA_UE_PATH}/Build"
"${CARLA_UE_PATH}/DerivedDataCache"
"${CARLA_UE_PATH}/Intermediate" "${CARLA_UE_PATH}/Intermediate"
"${CARLA_UE_PATH}/Saved" "${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}/Intermediate"
"${CARLA_UE_CARLA_TOOLS_PATH}/Saved" "${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}/Intermediate"
"${CARLA_UE_CARLA_PATH}/Saved" "${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}/Package"
"${CARLA_BUILD_PATH}/PythonAPI/dist" "${CARLA_BUILD_PATH}/PythonAPI/dist"
) )