bug fix

[u/mrichter/AliRoot.git] / PWGJE / CMakelibPWGJE.pkg

diff --git a/PWGJE/CMakelibPWGJE.pkg b/PWGJE/CMakelibPWGJE.pkg
index 789f8262e9b4560263bc707fd252bb332add5f62..467d7e7f3fa2d2a23a0d01edd0d3c00c3789ae8b 100644 (file)
--- a/PWGJE/CMakelibPWGJE.pkg
+++ b/PWGJE/CMakelibPWGJE.pkg
@@ -30,7 +30,6 @@ set ( SRCS
     AliAnaChargedJetResponseMaker.cxx
     AliAnalysisTaskAj.cxx
     AliAnalysisTaskFragmentationFunction.cxx
-    AliAnalysisTaskJetChem.cxx 
     AliAnalysisTaskJetCore.cxx         
     AliAnalysisTaskJetCorePP.cxx       
     AliAnalysisTaskJetProperties.cxx
@@ -53,19 +52,19 @@ set ( SRCS
     UserTasks/AliAnalysisTaskIDFragmentationFunction.cxx
     UserTasks/AliAnalysisTaskIDFFTCF.cxx
     UserTasks/AliIDFFUtils.cxx
-    )
-
-set(FASTJET_ROOT $ENV{FASTJET_ROOT})
+    UserTasks/AliAnalysisTaskPPJetSpectra.cxx
+    UserTasks/AliAnalysisTaskJetAntenna.cxx
+  )
 
 # Add code that needs fastjet or FJWrapper here 
-if (FASTJET_ROOT)
+if (FASTJET_FOUND)
   LIST(APPEND  SRCS
     UserTasks/AliAnalysisTaskCheckSingleTrackJetRejection.cxx 
     UserTasks/AliAnalysisTaskJetHadronCorrelation.cxx
     UserTasks/AliAnalysisTaskJetHBOM.cxx
   )
-  set ( CINTFLAGS ${CINTFLAGS} -DHAVE_FASTJET)
-endif(FASTJET_ROOT)
+  set ( CINTFLAGS ${CINTFLAGS} ${FASTJET_DEFINITIONS})
+endif(FASTJET_FOUND)
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
@@ -73,13 +72,12 @@ set ( DHDR  PWGJELinkDef.h)
 
 string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
 
-if(FASTJET_ROOT)
-  set (FASTJET_INC ${FASTJET_ROOT}/include)
-  set ( EINCLUDE ${FASTJET_INC} ANALYSIS JETAN CORRFW PWGJE PWG/Tools PWGCF/Correlations/Base STEER/AOD STEER/ESD STEER/STEERBase)
+set ( EINCLUDE ANALYSIS JETAN CORRFW PWGJE PWG/Tools PWG/FLOW/Tasks PWG/TRD PWGCF/Correlations/Base STEER/AOD STEER/ESD STEER/STEERBase STEER/CDB STEER/STEER)
+if(FASTJET_FOUND)
+#  set ( EDEFINE -isystem ${FASTJET_INCLUDE_DIR})
+  set ( EINCLUDE ${FASTJET_INCLUDE_DIR} PWGCF/Correlations PWGCF/Correlations/DPhi ${EINCLUDE})
   set ( HDRS ${HDRS}  EMCALJetTasks/FJ_includes.h  )
-else()
-  set ( EINCLUDE ANALYSIS JETAN CORRFW PWGJE PWG/Tools PWGCF/Correlations/Base STEER/AOD STEER/ESD STEER/STEERBase)
-endif(FASTJET_ROOT)
+endif(FASTJET_FOUND)
 
 
 install (DIRECTORY macros