From e5861e5c911961efefc2ac9e33ee295d5cca9d0d Mon Sep 17 00:00:00 2001
From: bernat <bernatx@gmail.com>
Date: Fri, 19 Jun 2020 17:13:51 +0200
Subject: [PATCH] Adding 'atomic' library at linking on Ubuntu

---
 LibCarla/cmake/client/CMakeLists.txt                      | 2 ++
 LibCarla/cmake/server/CMakeLists.txt                      | 4 ++++
 Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs | 1 +
 3 files changed, 7 insertions(+)

diff --git a/LibCarla/cmake/client/CMakeLists.txt b/LibCarla/cmake/client/CMakeLists.txt
index 094ca720f..4cf7df6c6 100644
--- a/LibCarla/cmake/client/CMakeLists.txt
+++ b/LibCarla/cmake/client/CMakeLists.txt
@@ -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)
 
diff --git a/LibCarla/cmake/server/CMakeLists.txt b/LibCarla/cmake/server/CMakeLists.txt
index 60fe079e1..836dff912 100644
--- a/LibCarla/cmake/server/CMakeLists.txt
+++ b/LibCarla/cmake/server/CMakeLists.txt
@@ -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)
 
diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs
index 37e6c1d9f..1ff9a01d1 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs
@@ -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")));