'CMakeLists.txt' (TrkMeasurementBase-02-00-02)

	* Adding a statement to the requirements file to handle this
	  package correctly in the CMake build.
	* Tagging as TrkMeasurementBase-02-00-02

2015-11-26  scott snyder  <snyder@bnl.gov>

	* Tagging TrkMeasurementBase-02-00-01.
	* Restore dictionary generation.  DataModel -> AthContainers.

Tracking/TrkEvent/TrkMeasurementBase/CMakeLists.txt

+################################################################################
+# Package: TrkMeasurementBase
+################################################################################
+
+# Declare the package name:
+atlas_subdir( TrkMeasurementBase )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          DetectorDescription/GeoPrimitives
+                          Event/EventPrimitives
+                          GaudiKernel
+                          Tracking/TrkEvent/TrkEventPrimitives
+                          PRIVATE
+                          Control/AthContainers )
+
+# External dependencies:
+find_package( Eigen )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_library( TrkMeasurementBase
+                   PUBLIC_HEADERS TrkMeasurementBase
+                   INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
+                   LINK_LIBRARIES ${EIGEN_LIBRARIES} GeoPrimitives EventPrimitives GaudiKernel TrkEventPrimitives )
+
+atlas_add_dictionary( TrkMeasurementBaseDict
+                      TrkMeasurementBase/TrkMeasurementBaseDict.h
+                      TrkMeasurementBase/selection.xml
+                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} GeoPrimitives EventPrimitives GaudiKernel TrkEventPrimitives AthContainers TrkMeasurementBase )
+

Tracking/TrkEvent/TrkMeasurementBase/TrkMeasurementBase/TrkMeasurementBaseDict.h

@@ -6,7 +6,7 @@
 #define TRKMEASUREMENTBASEDICT_H
 
 #include "TrkMeasurementBase/MeasurementBase.h"
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 // We need to instantiate some templates here to be able to create the
 // dictionary for them

Tracking/TrkEvent/TrkMeasurementBase/cmt/requirements

@@ -7,10 +7,11 @@ use GaudiInterface      GaudiInterface-*     External
 use EventPrimitives     EventPrimitives-*    Event
 use GeoPrimitives       GeoPrimitives-*      DetectorDescription
 use TrkEventPrimitives  TrkEventPrimitives-* Tracking/TrkEvent
-use DataModel           DataModel-*          Control
 
 private
-use AtlasReflex   AtlasReflex-*   External -no_auto_imports
+use AthContainers       AthContainers-*      Control
+
+use AtlasReflex         AtlasReflex-*        External -no_auto_imports
 
 # Pattern to build the dict lib. User should create a single header
 # file: <package>Dict.h which includes all other .h files. See MissingETDict
@@ -18,5 +19,7 @@ use AtlasReflex   AtlasReflex-*   External -no_auto_imports
 # classes to be added to the dictionary, and which fields are
 # transient. It should be put in ../<package> dir and is conventionally called
 # selection.xml.
-# apply_pattern lcgdict dict=TrkMeasurementBase selectionfile=selection.xml headerfiles="../TrkMeasurementBase/TrkMeasurementBaseDict.h"
+apply_pattern lcgdict dict=TrkMeasurementBase selectionfile=selection.xml headerfiles="../TrkMeasurementBase/TrkMeasurementBaseDict.h"
 
+# To make the package behave correctly with CMake:
+apply_pattern cmake_add_command command=metalibrary