ATO-119 - solving merge conflict

[u/mrichter/AliRoot.git] / HLT / CMakelibAliHLTTPC.pkg

diff --git a/HLT/CMakelibAliHLTTPC.pkg b/HLT/CMakelibAliHLTTPC.pkg
index d53fd4df8c74a691b917084af060c18e9789ce61..7610159f959b4aaf5c1929487a8163248a382926 100644 (file)
--- a/HLT/CMakelibAliHLTTPC.pkg
+++ b/HLT/CMakelibAliHLTTPC.pkg
@@ -32,6 +32,7 @@ set ( CLASS_HDRS
     transform/AliHLTTPCSpline2D3D.h
     transform/AliHLTTPCFastTransform.h
     AliHLTTPCClusterTransformation.h
+    AliHLTTPCClusterTransformationComponent.h
     AliHLTTPCAgent.h
     AliHLTTPCMemHandler.h
     AliHLTTPCFileHandler.h
@@ -52,7 +53,6 @@ set ( CLASS_HDRS
     AliHLTTPCClusters.h
     AliHLTTPCPad.h
     AliHLTTPCDefinitions.h
-    AliHLTTPCRawDataUnpackerComponent.h
     AliHLTTPCClusterFinderComponent.h
     AliHLTTPCHWClusterTransformComponent.h
     AliHLTTPCCFComparisonComponent.h
@@ -97,6 +97,7 @@ set ( CLASS_HDRS
     comp/AliHLTTPCDataCompressionMonitorComponent.h
     comp/AliHLTTPCDataCompressionDecoder.h
     comp/AliHLTTPCDataCompressionFilterComponent.h
+    comp/AliHLTTPCDataCompressionIDMap.h
     AliHLTTPCDataPublisherComponent.h
     AliHLTTPCClusterHistoComponent.h
     AliHLTTPCTrackHistoComponent.h
@@ -116,6 +117,8 @@ set ( CLASS_HDRS
     HWCFemulator/AliHLTTPCHWCFEmulatorComponent.h
     HWCFemulator/AliHLTTPCHWCFConsistencyControlComponent.h
     HWCFemulator/AliHLTTPCHWClusterMerger.h
+    HWCFemulator/AliHLTTPCHWClusterMergerV1.h
+    AliHLTTPCHWClusterDecoderComponent.h
 )
 
 string ( REPLACE ".h" ".cxx" MODULE_SRCS "${CLASS_HDRS}")
@@ -136,7 +139,7 @@ set ( MODULE_HDRS
 
 set ( MODULE_DHDR )
 
-set ( EINCLUDE  HLT/TPCLib HLT/TPCLib/tracking HLT/TPCLib/comp HLT/TPCLib/tracking-ca HLT/TPCLib/merger-ca HLT/TPCLib/offline HLT/TPCLib/HWCFemulator HLT/TPCLib/transform HLT/BASE HLT/BASE/util HLT/RCU TPC RAW STEER/STEER STEER/ESD STEER/STEERBase)
+set ( EINCLUDE  HLT/TPCLib HLT/TPCLib/tracking HLT/TPCLib/comp HLT/TPCLib/tracking-ca HLT/TPCLib/merger-ca HLT/TPCLib/offline HLT/TPCLib/HWCFemulator HLT/TPCLib/transform HLT/BASE HLT/BASE/util HLT/RCU TPC TPC/Base TPC/Sim TPC/Rec RAW STEER/STEER STEER/ESD STEER/STEERBase)
 set ( ELIBS  dl)
 
 set ( ELIBS  "Vc HLTbase AliHLTRCU AliHLTUtil CDB ESD STEER STEERBase TPCrec TPCcalib TPCbase RAWDatarec RAWDatabase -lEG")
@@ -162,11 +165,12 @@ if(NOT DHDR)
   set(CINTAUTOLINK 1)
 endif(NOT DHDR)
 
-set ( EDEFINE  ${HLTDEFS})
-set ( PACKCXXFLAGS  "${HLTCXXFLAGS} -Wshadow -Wall -O3")
+set ( EDEFINE  ${HLTDEFS} )
+#set ( PACKCXXFLAGS  "${HLTCXXFLAGS} -Wshadow -Wall -O3")
 set ( PACKCFLAGS  ${HLTCLFAGS})
 set ( PACKDCXXFLAGS  ${HLTDCXXFLAGS})
 set ( PACKSOFLAGS ${HLTSOFLAGS})
+set ( CINTFLAGS ${CINTFLAGS} -p)
 
 ALICE_UseVc()