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

Adding 'atomic' library at linking on Ubuntu

This commit is contained in:
bernat 2020-06-19 17:13:51 +02:00
parent acd85f0624
commit e5861e5c91
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LibCarla/cmake/client/CMakeLists.txt
View File

@ -282,6 +282,7 @@ if (LIBCARLA_BUILD_RELEASE)
target_link_libraries(carla_client${carla_target_postfix} "${RECAST_LIB_PATH}/libRecast.a")
target_link_libraries(carla_client${carla_target_postfix} "${RECAST_LIB_PATH}/libDetour.a")
target_link_libraries(carla_client${carla_target_postfix} "${RECAST_LIB_PATH}/libDetourCrowd.a")
target_link_libraries(carla_client${carla_target_postfix} "atomic")
endif (WIN32)
@ -321,6 +322,7 @@ if (LIBCARLA_BUILD_DEBUG)
target_link_libraries(carla_client${carla_target_postfix}_debug "${RECAST_LIB_PATH}/libRecast.a")
target_link_libraries(carla_client${carla_target_postfix}_debug "${RECAST_LIB_PATH}/libDetour.a")
target_link_libraries(carla_client${carla_target_postfix}_debug "${RECAST_LIB_PATH}/libDetourCrowd.a")
target_link_libraries(carla_client${carla_target_postfix}_debug "atomic")
endif (WIN32)

4
LibCarla/cmake/server/CMakeLists.txt
View File

@ -132,6 +132,8 @@ if (LIBCARLA_BUILD_RELEASE)
install(TARGETS carla_server DESTINATION lib OPTIONAL)
target_link_libraries(carla_server atomic)
set_target_properties(carla_server PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}")
endif()
@ -146,6 +148,8 @@ if (LIBCARLA_BUILD_DEBUG)
install(TARGETS carla_server_debug DESTINATION lib OPTIONAL)
target_link_libraries(carla_server_debug atomic)
set_target_properties(carla_server_debug PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG}")
target_compile_definitions(carla_server_debug PUBLIC -DBOOST_ASIO_ENABLE_BUFFER_DEBUGGING)

1
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs
View File

@ -135,6 +135,7 @@ public class Carla : ModuleRules
else
{
PublicAdditionalLibraries.Add(Path.Combine(LibCarlaInstallPath, "lib", GetLibName("rpc")));
PublicAdditionalLibraries.Add("atomic");
if (UseDebugLibs(Target))
{
PublicAdditionalLibraries.Add(Path.Combine(LibCarlaInstallPath, "lib", GetLibName("carla_server_debug")));