From 592409456487be7c5b87f1e02ad759d0ebcb702b Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Thu, 16 Jun 2016 03:06:05 +0200
Subject: [PATCH] 'Fix TrigSerializeCnvSvc dependency.'
(DataModelTestDataCommon-01-00-22)
* Tagging DataModelTestDataCommon-01-00-22.
* CMakeLists.txt: Fix TrigSerializeCnvSvc dependency.
2016-04-19 scott snyder <snyder@bnl.gov>
* Tagging DataModelTestDataCommon-01-00-21.
* CMakeLists.txt: Fixes.
2016-04-18 scott snyder <snyder@bnl.gov>
* Tagging DataModelTestDataCommon-01-00-20.
* cmt/requirements, CMakeLists.txt: Generate sercnv library.
---
.../DataModelTest/DataModelTestDataCommon/CMakeLists.txt | 9 ++++++++-
.../DataModelTestDataCommon/cmt/requirements | 9 +++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/Control/DataModelTest/DataModelTestDataCommon/CMakeLists.txt b/Control/DataModelTest/DataModelTestDataCommon/CMakeLists.txt
index e59c9b5a8c8..e1144f32924 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/CMakeLists.txt
+++ b/Control/DataModelTest/DataModelTestDataCommon/CMakeLists.txt
@@ -14,7 +14,8 @@ atlas_depends_on_subdirs( PUBLIC
Event/xAOD/xAODTrigger
GaudiKernel
PRIVATE
- Control/AthLinks )
+ Control/AthLinks
+ Trigger/TrigDataAccess/TrigSerializeCnvSvc )
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -36,3 +37,9 @@ atlas_add_dictionary( DataModelTestDataCommonDict
EXTRA_FILES src/dict/*.cxx
ELEMENT_LINKS DMTest::BAuxVec DMTest::CVec_v1 )
+
+atlas_add_sercnv_library ( DataModelTestDataCommonSerCnv
+ FILES DataModelTestDataCommon/CVec.h DataModelTestDataCommon/CAuxContainer.h
+ TYPES_WITH_NAMESPACE DMTest::CVec DMTest::CAuxContainer
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers SGTools xAODCore xAODTrigger GaudiKernel AthLinks TrigSerializeCnvSvcLib DataModelTestDataCommon )
diff --git a/Control/DataModelTest/DataModelTestDataCommon/cmt/requirements b/Control/DataModelTest/DataModelTestDataCommon/cmt/requirements
index 802840ec481..c30d3e04e1f 100755
--- a/Control/DataModelTest/DataModelTestDataCommon/cmt/requirements
+++ b/Control/DataModelTest/DataModelTestDataCommon/cmt/requirements
@@ -36,3 +36,12 @@ apply_pattern lcgdict dict=DataModelTestDataCommon selectionfile=selection.xml\
headerfiles="../DataModelTestDataCommon/DataModelTestDataCommonDict.h" \
extralibfiles=../src/dict/*.cxx
+
+private
+use TrigSerializeUtils TrigSerializeUtils-* Trigger/TrigDataAccess
+
+
+apply_pattern sercnv \
+ typesWithNamespace="DMTest::CVec DMTest::CAuxContainer" \
+ files=" -s=${DataModelTestDataCommon_root}/DataModelTestDataCommon \
+ CVec.h CAuxContainer.h "
--
GitLab