From 9ed62e837ac72f9482fa4e42cdcb6f7cf62873e5 Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch> Date: Sun, 20 Oct 2019 14:53:51 +0200 Subject: [PATCH] Updated all necessary libraries to use ROOT_ATOMIC_LIBS. Whichever library was missing a link against libatomic in my Raspberry Pi test build, received a link against ROOT_ATOMIC_LIBS in this update. --- io/io/CMakeLists.txt | 1 + net/net/CMakeLists.txt | 2 ++ proof/proof/CMakeLists.txt | 2 ++ tree/tree/CMakeLists.txt | 2 ++ 4 files changed, 7 insertions(+) diff --git a/io/io/CMakeLists.txt b/io/io/CMakeLists.txt index 29f7141ae4e..c30101938d3 100644 --- a/io/io/CMakeLists.txt +++ b/io/io/CMakeLists.txt @@ -54,6 +54,7 @@ ROOT_LINKER_LIBRARY(RIO $<TARGET_OBJECTS:RootPcmObjs> LIBRARIES ${CMAKE_DL_LIBS} + ${ROOT_ATOMIC_LIBS} DEPENDENCIES Core Thread diff --git a/net/net/CMakeLists.txt b/net/net/CMakeLists.txt index 6decebc78dc..f7612e60a41 100644 --- a/net/net/CMakeLists.txt +++ b/net/net/CMakeLists.txt @@ -100,6 +100,8 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Net -writeEmptyRootPCM DEPENDENCIES RIO + LIBRARIES + ${ROOT_ATOMIC_LIBS} ) if(ssl) diff --git a/proof/proof/CMakeLists.txt b/proof/proof/CMakeLists.txt index 98af4704c41..7ea5a141c1e 100644 --- a/proof/proof/CMakeLists.txt +++ b/proof/proof/CMakeLists.txt @@ -86,4 +86,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Proof RIO Thread Tree + LIBRARIES + ${ROOT_ATOMIC_LIBS} ) diff --git a/tree/tree/CMakeLists.txt b/tree/tree/CMakeLists.txt index 330fd9233cd..9b3ae77802e 100644 --- a/tree/tree/CMakeLists.txt +++ b/tree/tree/CMakeLists.txt @@ -119,6 +119,8 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Tree Imt Net RIO + LIBRARIES + ${ROOT_ATOMIC_LIBS} ) ROOT_ADD_TEST_SUBDIRECTORY(test) -- GitLab