From: agrigora <alina.grigoras@cern.ch>
Date: Fri, 31 Oct 2014 15:44:30 +0000 (+0100)
Subject: Fix after rebasing master
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=7296b0dafefb2fd7110735ec9fc66ec5de24ab35;p=u%2Fmrichter%2FAliRoot.git

Fix after rebasing master
---

diff --git a/RAW/RAWDatarec/CMakeLists.txt b/RAW/RAWDatarec/CMakeLists.txt
index ce716f3d434..f1120ec4aa1 100644
--- a/RAW/RAWDatarec/CMakeLists.txt
+++ b/RAW/RAWDatarec/CMakeLists.txt
@@ -22,6 +22,7 @@ include_directories(${CMAKE_SOURCE_DIR}/RAW/${MODULE})
 # Additional include folders in alphabetical order except ROOT
 include_directories(${ROOT_INCLUDE_DIRS}
                     ${CMAKE_SOURCE_DIR}/HLT/rec
+                    ${CMAKE_SOURCE_DIR}/RAW/dateStream
                     ${CMAKE_SOURCE_DIR}/RAW/RAWDatabase
                     ${CMAKE_SOURCE_DIR}/STEER/ESD
                     ${CMAKE_SOURCE_DIR}/STEER/STEERBase
diff --git a/STEER/AOD/CMakeLists.txt b/STEER/AOD/CMakeLists.txt
index 5aa5203b242..eaf227402d9 100644
--- a/STEER/AOD/CMakeLists.txt
+++ b/STEER/AOD/CMakeLists.txt
@@ -64,6 +64,7 @@ set(SRCS
     AliAODVertex.cxx
     AliAODVZERO.cxx
     AliAODZDC.cxx
+    AliNanoAODTrackMapping.cxx
    )
 
 # Sources from headers