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

Revert "Build ROS2 dependencies as static libraries" 

This reverts commit b7e7046168.
This commit is contained in:
Joel Moriana 2024-12-17 12:06:35 +01:00 committed by Blyron
parent a6f368fe18
commit aa61ab20ec
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Ros2Native/CMakeLists.txt
View File

@ -16,7 +16,7 @@ ExternalProject_add (
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX=${PROJECT_INSTALL_PATH} -DCMAKE_INSTALL_PREFIX=${PROJECT_INSTALL_PATH}
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-DBUILD_SHARED_LIBS=OFF -DBUILD_SHARED_LIBS=ON
-DFOONATHAN_MEMORY_FORCE_VENDORED_BUILD=ON -DFOONATHAN_MEMORY_FORCE_VENDORED_BUILD=ON
) )
@ -30,7 +30,7 @@ ExternalProject_add (
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX=${PROJECT_INSTALL_PATH} -DCMAKE_INSTALL_PREFIX=${PROJECT_INSTALL_PATH}
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-DBUILD_SHARED_LIBS=OFF -DBUILD_SHARED_LIBS=ON
-DBUILD_TESTING=OFF -DBUILD_TESTING=OFF
-DCOMPILE_EXAMPLES=OFF -DCOMPILE_EXAMPLES=OFF
-DCOMPILE_TOOLS=OFF -DCOMPILE_TOOLS=OFF
@ -64,7 +64,7 @@ add_custom_command (
POST_BUILD POST_BUILD
COMMAND COMMAND
${CMAKE_COMMAND} -E copy ${CMAKE_COMMAND} -E copy
${PROJECT_INSTALL_PATH}/lib/*.a ${PROJECT_INSTALL_PATH}/lib/*.so*
${CARLA_PLUGIN_BINARY_PATH} ${CARLA_PLUGIN_BINARY_PATH}
) )

6
Ros2Native/LibCarlaRos2Native/CMakeLists.txt
View File

@ -32,7 +32,7 @@ file (
add_library ( add_library (
carla-ros2-native carla-ros2-native
STATIC SHARED
${LIBCARLA_ROS2_HEADERS} ${LIBCARLA_ROS2_HEADERS}
${LIBCARLA_ROS2_SOURCES} ${LIBCARLA_ROS2_SOURCES}
) )
@ -52,9 +52,7 @@ target_compile_definitions (
target_link_libraries ( target_link_libraries (
carla-ros2-native PUBLIC carla-ros2-native PUBLIC
${CMAKE_INSTALL_PREFIX}/lib/libfastrtps.a ${CMAKE_INSTALL_PREFIX}/lib/libfastrtps.so
${CMAKE_INSTALL_PREFIX}/lib/libfastcdr.a
${CMAKE_INSTALL_PREFIX}/lib/libfoonathan_memory-0.7.3.a
) )
install ( install (

12
Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.Build.cs
View File

@ -172,10 +172,14 @@ public class Carla :
string CarlaPluginSourcePath = Path.GetFullPath(ModuleDirectory); string CarlaPluginSourcePath = Path.GetFullPath(ModuleDirectory);
string CarlaPluginBinariesLinuxPath = Path.Combine(CarlaPluginSourcePath, "..", "..", "Binaries", "Linux"); string CarlaPluginBinariesLinuxPath = Path.Combine(CarlaPluginSourcePath, "..", "..", "Binaries", "Linux");
PublicAdditionalLibraries.Add(Path.Combine(CarlaPluginBinariesLinuxPath, "libcarla-ros2-native.a")); AddDynamicLibrary(Path.Combine(CarlaPluginBinariesLinuxPath, "libcarla-ros2-native.so"));
PublicAdditionalLibraries.Add(Path.Combine(CarlaPluginBinariesLinuxPath, "libfastcdr.a")); RuntimeDependencies.Add(Path.Combine(CarlaPluginBinariesLinuxPath, "libfoonathan_memory-0.7.3.so"));
PublicAdditionalLibraries.Add(Path.Combine(CarlaPluginBinariesLinuxPath, "libfastrtps.a")); RuntimeDependencies.Add(Path.Combine(CarlaPluginBinariesLinuxPath, "libfastcdr.so"));
PublicAdditionalLibraries.Add(Path.Combine(CarlaPluginBinariesLinuxPath, "libfoonathan_memory-0.7.3.a")); RuntimeDependencies.Add(Path.Combine(CarlaPluginBinariesLinuxPath, "libfastcdr.so.1"));
RuntimeDependencies.Add(Path.Combine(CarlaPluginBinariesLinuxPath, "libfastcdr.so.1.1.0"));
RuntimeDependencies.Add(Path.Combine(CarlaPluginBinariesLinuxPath, "libfastrtps.so"));
RuntimeDependencies.Add(Path.Combine(CarlaPluginBinariesLinuxPath, "libfastrtps.so.2.11"));
RuntimeDependencies.Add(Path.Combine(CarlaPluginBinariesLinuxPath, "libfastrtps.so.2.11.2"));
} }
} }
} }