X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PWGJE%2FCMakelibPWGJE.pkg;h=467d7e7f3fa2d2a23a0d01edd0d3c00c3789ae8b;hb=f9eee2ab2e267bfdf41d5dfcb73d1481ff686fd9;hp=3b41b573cd84275e5c330eb1fb5804d5270f3a37;hpb=bf7cfc8822d988e842942dd8af2a69cd20215816;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PWGJE/CMakelibPWGJE.pkg b/PWGJE/CMakelibPWGJE.pkg
index 3b41b573cd8..467d7e7f3fa 100644
--- 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
@@ -45,9 +44,6 @@ set ( SRCS
     AliPWG4HighPtQATPConly.cxx 
     AliPWG4HighPtSpectra.cxx 
     AliPWG4HighPtTrackQA.cxx 
-    UserTasks/AliAnalysisTaskCheckSingleTrackJetRejection.cxx 
-    UserTasks/AliAnalysisTaskJetHadronCorrelation.cxx
-    UserTasks/AliAnalysisTaskJetHBOM.cxx
     UserTasks/AliAnalysisTaskJetShape.cxx
     UserTasks/AliAnalysisTaskJetsTriggerTRD.cxx
     UserTasks/AliAnalysisTaskJetProtonCorr.cxx
@@ -56,7 +52,19 @@ set ( SRCS
     UserTasks/AliAnalysisTaskIDFragmentationFunction.cxx
     UserTasks/AliAnalysisTaskIDFFTCF.cxx
     UserTasks/AliIDFFUtils.cxx
-    )
+    UserTasks/AliAnalysisTaskPPJetSpectra.cxx
+    UserTasks/AliAnalysisTaskJetAntenna.cxx
+  )
+
+# Add code that needs fastjet or FJWrapper here 
+if (FASTJET_FOUND)
+  LIST(APPEND  SRCS
+    UserTasks/AliAnalysisTaskCheckSingleTrackJetRejection.cxx 
+    UserTasks/AliAnalysisTaskJetHadronCorrelation.cxx
+    UserTasks/AliAnalysisTaskJetHBOM.cxx
+  )
+  set ( CINTFLAGS ${CINTFLAGS} ${FASTJET_DEFINITIONS})
+endif(FASTJET_FOUND)
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
@@ -64,19 +72,13 @@ set ( DHDR  PWGJELinkDef.h)
 
 string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
 
-set ( HDRS ${HDRS}  EMCALJetTasks/FJ_includes.h  )
-
-set(FASTJET_ROOT $ENV{FASTJET_ROOT})
-
-if(FASTJET_ROOT)
-  set (FASTJET_INC ${FASTJET_ROOT}/include)
-else()
-  set (FASTJET_INC JETAN/fastjet)
-endif(FASTJET_ROOT)
+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  )
+endif(FASTJET_FOUND)
 
-#set ( EDEFINE -isystem${FASTJET_INC})
-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 PWGCF/Correlations/Base STEER/AOD STEER/ESD STEER/STEERBase)
 
 install (DIRECTORY macros
 	 DESTINATION PWGJE