Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / JETAN / CMakelibFASTJETAN.pkg

diff --git a/JETAN/CMakelibFASTJETAN.pkg b/JETAN/CMakelibFASTJETAN.pkg
index ac0636564ca35930c0e911076bc4e31e8debcac4..457a574f2c39cd9bf5bd6d8f92fbeacd5cb36558 100644 (file)
--- a/JETAN/CMakelibFASTJETAN.pkg
+++ b/JETAN/CMakelibFASTJETAN.pkg
@@ -25,19 +25,12 @@
 # SHLIBS - Shared Libraries and objects for linking (Executables only)           #
 #--------------------------------------------------------------------------------#
 
-set ( SRCS DEV/AliFastJetFinder.cxx DEV/AliFastJetHeaderV1.cxx DEV/AliFastJetInput.cxx DEV/AliFastJetBkg.cxx DEV/AliSISConeJetFinder.cxx DEV/AliSISConeJetHeader.cxx DEV/AliAnalysisTaskJetCluster.cxx DEV/AliAnalysisTaskJetBackgroundSubtract.cxx)
-
-set(FASTJET_ROOT $ENV{FASTJET_ROOT})
-
-if(FASTJET_ROOT)
-  set (FASTJET_INC ${FASTJET_ROOT}/include)
-else()
-  set (FASTJET_INC ${ALICE_ROOT}/JETAN/fastjet)
-endif(FASTJET_ROOT)
+set ( SRCS AliFastJetFinder.cxx AliFastJetHeaderV1.cxx AliFastJetInput.cxx AliFastJetBkg.cxx AliSISConeJetFinder.cxx AliSISConeJetHeader.cxx AliAnalysisTaskJetCluster.cxx AliAnalysisTaskJetClusterKine.cxx AliAnalysisTaskJetBackgroundSubtract.cxx)
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
-set ( DHDR  FASTJETANdevLinkDef.h)
+set ( DHDR  FASTJETANLinkDef.h)
+
+set ( EDEFINE -isystem${FASTJET_INCLUDE_DIR} ) # Not sure whether we need this...
+set ( EINCLUDE ${FASTJET_INCLUDE_DIR} ANALYSIS STEER/AOD STEER/STEERBase )
 
-set ( EDEFINE -isystem${FASTJET_INC} )
-set ( EINCLUDE ${FASTJET_INC} ANALYSIS STEER/AOD STEER/STEERBase )