For fastjet-3.x the defines were changed to have the additional prefix
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 13 May 2013 12:23:09 +0000 (12:23 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 13 May 2013 12:23:09 +0000 (12:23 +0000)
FASTJET_. In AliSISConeJetFinder.cxx SISConePlugin.hh is only included
if ENABLE_PLUGIN_SISCONE is set. With the attached patch also
FASTJET_ENABLE_PLUGIN_SISCONE is accepted and AliRoot compiles fine
against fastjet-3.0.3.
Jochen Klein

JETAN/AliSISConeJetFinder.cxx
JETAN/DEV/AliSISConeJetFinder.cxx

index e2662d5..8c10e5c 100644 (file)
@@ -50,7 +50,7 @@
 // get info on how fastjet was configured
 #include "fastjet/config.h"
 
-#ifdef ENABLE_PLUGIN_SISCONE
+#if defined(ENABLE_PLUGIN_SISCONE) || defined(FASTJET_ENABLE_PLUGIN_SISCONE)
 #include "fastjet/SISConePlugin.hh"
 #endif
 
index c253219..07e58db 100644 (file)
@@ -40,7 +40,7 @@
 // get info on how fastjet was configured
 #include "fastjet/config.h"
 
-#ifdef ENABLE_PLUGIN_SISCONE
+#if defined(ENABLE_PLUGIN_SISCONE) || defined(FASTJET_ENABLE_PLUGIN_SISCONE)
 #include "fastjet/SISConePlugin.hh"
 #endif