From f0bb45eb8f4078c6d5b229374cc17cb730dc919c Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Fri, 22 May 2020 09:58:01 +0200
Subject: [PATCH] Cleaned the CMake configuration of xAODPrimitives.
Removed its unnecessary direct ROOT dependency, and its usage of
the atlas_depends_on_subdirs(...) function.
---
Event/xAOD/xAODPrimitives/CMakeLists.txt | 40 +++++++-----------------
1 file changed, 12 insertions(+), 28 deletions(-)
diff --git a/Event/xAOD/xAODPrimitives/CMakeLists.txt b/Event/xAOD/xAODPrimitives/CMakeLists.txt
index 7f3c474e611..6389e0bf700 100644
--- a/Event/xAOD/xAODPrimitives/CMakeLists.txt
+++ b/Event/xAOD/xAODPrimitives/CMakeLists.txt
@@ -1,36 +1,20 @@
-################################################################################
-# Package: xAODPrimitives
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-# Declare the package name:
+# Declare the package name.
atlas_subdir( xAODPrimitives )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthContainers
- PRIVATE
- AtlasTest/TestTools )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
-# Component(s) in the package:
+# Component(s) in the package.
atlas_add_library( xAODPrimitives
- Root/*.cxx
- PUBLIC_HEADERS xAODPrimitives
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthContainers
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools )
+ xAODPrimitives/*.h xAODPrimitives/tools/*.h Root/*.cxx
+ PUBLIC_HEADERS xAODPrimitives
+ LINK_LIBRARIES AthContainers )
atlas_add_dictionary( xAODPrimitivesDict
- xAODPrimitives/xAODPrimitivesDict.h
- xAODPrimitives/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers TestTools xAODPrimitives )
+ xAODPrimitives/xAODPrimitivesDict.h
+ xAODPrimitives/selection.xml
+ LINK_LIBRARIES xAODPrimitives )
+# Test(s) in the package.
atlas_add_test( ut_xAOD_primitives_enums_test
- SOURCES
- test/ut_xAOD_primitives_enums_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers TestTools xAODPrimitives )
-
+ SOURCES test/ut_xAOD_primitives_enums_test.cxx
+ LINK_LIBRARIES xAODPrimitives )
--
GitLab