CMakeLists.txt: Remove reference to CLHEP_INCLUDE_DIRS. (DataModelTestDataCommon-01-00-24)

 	* Tagging DataModelTestDataCommon-01-00-24.
	* CMakeLists.txt: Remove reference to CLHEP_INCLUDE_DIRS.

2016-10-07  scott snyder  <snyder@bnl.gov>

 	* Tagging DataModelTestDataCommon-01-00-23.
	* Additions to allow testing writing ViewVector into bytestream.

Control/DataModelTest/DataModelTestDataCommon/CMakeLists.txt

@@ -39,7 +39,7 @@ atlas_add_dictionary( DataModelTestDataCommonDict
 
 
 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}
+  FILES DataModelTestDataCommon/CVec.h DataModelTestDataCommon/CView.h DataModelTestDataCommon/CAuxContainer.h
+  TYPES_WITH_NAMESPACE DMTest::CVec DMTest::CView DMTest::CAuxContainer
+  INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} 
   LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers SGTools xAODCore xAODTrigger GaudiKernel AthLinks TrigSerializeCnvSvcLib DataModelTestDataCommon )

Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/selection.xml

@@ -31,5 +31,6 @@
 
   <function name="DMTest::setPluginLibrary"/>
   <function name="DMTest::setConverterLibrary"/>
+  <function name="DMTest::setTrigConverterLibrary"/>
 
 </lcgdict>

Control/DataModelTest/DataModelTestDataCommon/DataModelTestDataCommon/setConverterLibrary.h

@@ -27,6 +27,8 @@ namespace DMTest {
 void setPluginLibrary (const std::string& name, const std::string& lib);
 void setConverterLibrary (CLID clid, const std::string& lib);
 void setConverterLibrary (const std::string& lib);
+void setTrigConverterLibrary (CLID clid, const std::string& lib);
+void setTrigConverterLibrary (const std::string& lib);
 
 
 } // namespace DMTest

Control/DataModelTest/DataModelTestDataCommon/cmt/requirements

@@ -42,6 +42,6 @@ use TrigSerializeUtils  TrigSerializeUtils-*    Trigger/TrigDataAccess
 
 
 apply_pattern sercnv \
- typesWithNamespace="DMTest::CVec DMTest::CAuxContainer" \
+ typesWithNamespace="DMTest::CVec DMTest::CView DMTest::CAuxContainer" \
  files=" -s=${DataModelTestDataCommon_root}/DataModelTestDataCommon \
-             CVec.h CAuxContainer.h "
+             CVec.h CView.h CAuxContainer.h "

Control/DataModelTest/DataModelTestDataCommon/src/setConverterLibrary.cxx

@@ -62,6 +62,23 @@ void setConverterLibrary (const std::string& lib)
   setConverterLibrary (9742, lib); // DMTest::GAuxContainer_v1
   setConverterLibrary (9744, lib); // DMTest::G_v1
   setConverterLibrary (9779, lib); // DMTest::CView_v1
+  setPluginLibrary ("_PERS_DMTest::HVec_v1", lib);
+  setPluginLibrary ("_PERS_DataVector<DMTest::H_v1>", lib);
+}
+
+
+void setTrigConverterLibrary (CLID clid, const std::string& lib)
+{
+  std::string name = "CNV_81_" + std::to_string (clid);
+  setPluginLibrary (name, lib);
+}
+
+
+void setTrigConverterLibrary (const std::string& lib)
+{
+  setTrigConverterLibrary (9781, lib); // DMTest::HVec
+  setTrigConverterLibrary (9782, lib); // DMTest::HAuxContainer
+  setTrigConverterLibrary (9787, lib); // DMTest::HView
 }