diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/CMakeLists.txt b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/CMakeLists.txt
index a8f11b1520b34b8209c20c6d8313ab73da8e1448..ceaa6e6ce0e850afb82c1801000b69b532e7a661 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/CMakeLists.txt
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/CMakeLists.txt
@@ -1,101 +1,30 @@
-################################################################################
-# Package: AFP_EventTPCnv
-################################################################################
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-# Declare the package name:
+# Declare the package name.
atlas_subdir( AFP_EventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- ForwardDetectors/AFP/AFP_DigiEv
- ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv
- ForwardDetectors/AFP/AFP_SimEv
- ForwardDetectors/AFP/AFP_RawEv
- PRIVATE
- DetectorDescription/Identifier
- GaudiKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
-# Component(s) in the package:
-atlas_add_library( AFP_EventTPCnv
- src/*.cxx
- PUBLIC_HEADERS AFP_EventTPCnv
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolUtilities AFP_DigiEv AFP_LocRecoEv AFP_SimEv AFP_RawEv AthenaPoolCnvSvcLib
- PRIVATE_LINK_LIBRARIES Identifier GaudiKernel )
+# Component(s) in the package.
+atlas_add_tpcnv_library( AFP_EventTPCnv
+ AFP_EventTPCnv/*.h src/*.cxx
+ PUBLIC_HEADERS AFP_EventTPCnv
+ LINK_LIBRARIES AthenaPoolUtilities AthenaPoolCnvSvcLib AFP_DigiEv
+ AFP_LocRecoEv AFP_SimEv AFP_RawEv AthenaPoolCnvSvcLib
+ PRIVATE_LINK_LIBRARIES Identifier GaudiKernel )
atlas_add_dictionary( AFP_EventTPCnvDict
- AFP_EventTPCnv/AFP_EventTPCnvDict.h
- AFP_EventTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities AFP_DigiEv AFP_LocRecoEv AFP_SimEv AFP_RawEv Identifier GaudiKernel AFP_EventTPCnv )
-
-
-atlas_add_test( AFP_RawDataCnv_p1_test
- SOURCES
- test/AFP_RawDataCnv_p1_test.cxx
- LINK_LIBRARIES AFP_EventTPCnv )
-
-
-atlas_add_test( AFP_RawDataCollectionCnv_p1_test
- SOURCES
- test/AFP_RawDataCollectionCnv_p1_test.cxx
- LINK_LIBRARIES AFP_EventTPCnv )
-
-
-atlas_add_test( AFP_RawDataContainerCnv_p1_test
- SOURCES
- test/AFP_RawDataContainerCnv_p1_test.cxx
- LINK_LIBRARIES AFP_EventTPCnv )
-
-
-atlas_add_test( AFP_SiDigiCnv_p1_test
- SOURCES
- test/AFP_SiDigiCnv_p1_test.cxx
- LINK_LIBRARIES AFP_EventTPCnv )
-
-
-atlas_add_test( AFP_SIDLocRecoEventCnv_p1_test
- SOURCES
- test/AFP_SIDLocRecoEventCnv_p1_test.cxx
- LINK_LIBRARIES AFP_EventTPCnv )
-
-
-atlas_add_test( AFP_SIDLocRecoEvCollectionCnv_p1_test
- SOURCES
- test/AFP_SIDLocRecoEvCollectionCnv_p1_test.cxx
- LINK_LIBRARIES AFP_EventTPCnv )
-
-
-atlas_add_test( AFP_SIDSimHitCnv_p1_test
- SOURCES
- test/AFP_SIDSimHitCnv_p1_test.cxx
- LINK_LIBRARIES AFP_EventTPCnv )
-
-
-atlas_add_test( AFP_TDDigiCnv_p1_test
- SOURCES
- test/AFP_TDDigiCnv_p1_test.cxx
- LINK_LIBRARIES AFP_EventTPCnv )
-
-
-atlas_add_test( AFP_TDLocRecoEventCnv_p1_test
- SOURCES
- test/AFP_TDLocRecoEventCnv_p1_test.cxx
- LINK_LIBRARIES AFP_EventTPCnv )
-
-
-atlas_add_test( AFP_TDLocRecoEvCollectionCnv_p1_test
- SOURCES
- test/AFP_TDLocRecoEvCollectionCnv_p1_test.cxx
- LINK_LIBRARIES AFP_EventTPCnv )
-
-
-atlas_add_test( AFP_TDSimHitCnv_p1_test
- SOURCES
- test/AFP_TDSimHitCnv_p1_test.cxx
- LINK_LIBRARIES AFP_EventTPCnv )
+ AFP_EventTPCnv/AFP_EventTPCnvDict.h
+ AFP_EventTPCnv/selection.xml
+ LINK_LIBRARIES AFP_EventTPCnv )
+
+# Test(s) in the package.
+foreach( test AFP_RawDataCnv_p1_test AFP_RawDataCollectionCnv_p1_test
+ AFP_RawDataContainerCnv_p1_test AFP_SiDigiCnv_p1_test
+ AFP_SIDLocRecoEventCnv_p1_test AFP_SIDLocRecoEvCollectionCnv_p1_test
+ AFP_SIDSimHitCnv_p1_test AFP_TDDigiCnv_p1_test AFP_TDLocRecoEventCnv_p1_test
+ AFP_TDLocRecoEvCollectionCnv_p1_test AFP_TDSimHitCnv_p1_test )
+
+ atlas_add_test( ${test}
+ SOURCES test/${test}.cxx
+ LINK_LIBRARIES GaudiKernel TestTools AFP_EventTPCnv )
+
+endforeach()