From 06559398fe8b1e511e029ae37155e1da008062b2 Mon Sep 17 00:00:00 2001 From: hristov Date: Tue, 22 Oct 2013 19:01:35 +0000 Subject: [PATCH] Corrected EINCLUDE, compilation with Root6 --- PWGLF/CMakelibPWGLFQATasks.pkg | 2 +- PWGLF/CMakelibPWGLFSTRANGENESS.pkg | 2 +- PWGLF/CMakelibPWGLFresonances.pkg | 2 +- PWGLF/CMakelibPWGLFrsnextra.pkg | 2 +- PWGLF/CMakelibPWGLFspectra.pkg | 2 +- PWGLF/CMakelibPWGLFtotEt.pkg | 2 +- PWGLF/PWGLFforward2LinkDef.h | 4 +--- PWGLF/SPECTRA/PiKaPr/TOF/pp7/TOFSpectrappAnalysis.h | 2 +- 8 files changed, 8 insertions(+), 10 deletions(-) diff --git a/PWGLF/CMakelibPWGLFQATasks.pkg b/PWGLF/CMakelibPWGLFQATasks.pkg index 585466032b3..97332aceaea 100644 --- a/PWGLF/CMakelibPWGLFQATasks.pkg +++ b/PWGLF/CMakelibPWGLFQATasks.pkg @@ -37,4 +37,4 @@ set ( DHDR PWGLFQATasksLinkDef.h) set ( EXPORT ) -set ( EINCLUDE ANALYSIS PWGLF/QATasks STEER/ESD STEER/STEERBase) +set ( EINCLUDE ANALYSIS PWGLF/QATasks STEER/ESD STEER/AOD STEER/STEERBase) diff --git a/PWGLF/CMakelibPWGLFSTRANGENESS.pkg b/PWGLF/CMakelibPWGLFSTRANGENESS.pkg index 3a19d3a5422..11e973cb28e 100644 --- a/PWGLF/CMakelibPWGLFSTRANGENESS.pkg +++ b/PWGLF/CMakelibPWGLFSTRANGENESS.pkg @@ -62,7 +62,7 @@ set ( DHDR PWGLFSTRANGENESSLinkDef.h) set ( EXPORT ) -set ( EINCLUDE PWGLF/STRANGENESS/Cascades PWGLF/STRANGENESS/LambdaK0 PWGLF/STRANGENESS/LambdaK0PbPb PWGLF/STRANGENESS/Correlations PWGLF/STRANGENESS/Hypernuclei STEER/ESD STEER/STEERBase) +set ( EINCLUDE PWGLF/STRANGENESS/Cascades PWGLF/STRANGENESS/LambdaK0 PWGLF/STRANGENESS/LambdaK0PbPb PWGLF/STRANGENESS/Correlations PWGLF/STRANGENESS/Hypernuclei STEER/ESD STEER/STEERBase ANALYSIS) #install (DIRECTORY PWGLF/STRANGENESS/Cascades/macros # DESTINATION PWGLF/STRANGENESS diff --git a/PWGLF/CMakelibPWGLFresonances.pkg b/PWGLF/CMakelibPWGLFresonances.pkg index 452b757ce29..bed93e4e73d 100644 --- a/PWGLF/CMakelibPWGLFresonances.pkg +++ b/PWGLF/CMakelibPWGLFresonances.pkg @@ -94,7 +94,7 @@ set ( DHDR PWGLFresonancesLinkDef.h) set ( EXPORT ) -set ( EINCLUDE PYTHIA6 PWGLF/RESONANCES CORRFW ANALYSIS/EventMixing STEER/AOD STEER/ESD STEER/STEERBase ${EXTRA_INCLUDE}) +set ( EINCLUDE PYTHIA6 PWGLF/RESONANCES CORRFW ANALYSIS/EventMixing STEER/AOD STEER/ESD STEER/STEERBase ${EXTRA_INCLUDE} ANALYSIS) set ( PARINCLUDE PWGLF/RESONANCES ) set ( EXPORT ${HDRS}) diff --git a/PWGLF/CMakelibPWGLFrsnextra.pkg b/PWGLF/CMakelibPWGLFrsnextra.pkg index 56518e7e850..88a4b25b327 100644 --- a/PWGLF/CMakelibPWGLFrsnextra.pkg +++ b/PWGLF/CMakelibPWGLFrsnextra.pkg @@ -41,4 +41,4 @@ set ( DHDR PWGLFrsnextraLinkDef.h) set ( EXPORT ) -set ( EINCLUDE PYTHIA6 CORRFW PWGLF/RESONANCES PWGLF/RESONANCES/extra TOF STEER/ESD STEER/STEERBase) +set ( EINCLUDE PYTHIA6 CORRFW PWGLF/RESONANCES PWGLF/RESONANCES/extra TOF STEER/ESD STEER/AOD STEER/STEERBase ANALYSIS) diff --git a/PWGLF/CMakelibPWGLFspectra.pkg b/PWGLF/CMakelibPWGLFspectra.pkg index 2c12683800b..09ca4c36daa 100644 --- a/PWGLF/CMakelibPWGLFspectra.pkg +++ b/PWGLF/CMakelibPWGLFspectra.pkg @@ -76,4 +76,4 @@ set ( DHDR PWGLFspectraLinkDef.h) set ( EXPORT ) -set ( EINCLUDE PWGLF/SPECTRA/Nuclei/B2 PWGLF/SPECTRA/PiKaPr/TPCTOF PWGLF/SPECTRA/PiKaPr/TPCTOFpA PWGLF/SPECTRA/PiKaPr/TOF/pp7 PWGLF/SPECTRA/ChargedHadrons/dNdPt TPC TOF PWGUD/base STEER/STEER STEER/ESD STEER/STEERBase) +set ( EINCLUDE PWGLF/SPECTRA/Nuclei/B2 PWGLF/SPECTRA/PiKaPr/TPCTOF PWGLF/SPECTRA/PiKaPr/TPCTOFpA PWGLF/SPECTRA/PiKaPr/TOF/pp7 PWGLF/SPECTRA/ChargedHadrons/dNdPt TPC TOF PWGUD/base STEER/STEER STEER/ESD STEER/AOD STEER/CDB STEER/STEERBase ANALYSIS) diff --git a/PWGLF/CMakelibPWGLFtotEt.pkg b/PWGLF/CMakelibPWGLFtotEt.pkg index bc1d63bfd29..9056834941c 100644 --- a/PWGLF/CMakelibPWGLFtotEt.pkg +++ b/PWGLF/CMakelibPWGLFtotEt.pkg @@ -58,4 +58,4 @@ set ( DHDR PWGLFtotEtLinkDef.h) string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) -set ( EINCLUDE ANALYSIS PWGUD/base PWGLF/totEt STEER/STEERBase) +set ( EINCLUDE ANALYSIS PWGUD/base PWGLF/totEt STEER/ESD STEER/STEERBase) diff --git a/PWGLF/PWGLFforward2LinkDef.h b/PWGLF/PWGLFforward2LinkDef.h index 9e6375a22de..ba0a8b5bee0 100644 --- a/PWGLF/PWGLFforward2LinkDef.h +++ b/PWGLF/PWGLFforward2LinkDef.h @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA */ -#if defined(__CINT__) && defined(__MAKECINT__) +#ifdef __CINT__ /** * @file PWGLFforward2LinkDef.h * @author Christian Holm Christensen @@ -170,8 +170,6 @@ #endif #pragma link C++ class AliForwardMultDists::BinSpec+; -#else -# error Not for compilation #endif // // EOF diff --git a/PWGLF/SPECTRA/PiKaPr/TOF/pp7/TOFSpectrappAnalysis.h b/PWGLF/SPECTRA/PiKaPr/TOF/pp7/TOFSpectrappAnalysis.h index aa7e4935c21..ed9c449574a 100644 --- a/PWGLF/SPECTRA/PiKaPr/TOF/pp7/TOFSpectrappAnalysis.h +++ b/PWGLF/SPECTRA/PiKaPr/TOF/pp7/TOFSpectrappAnalysis.h @@ -1,5 +1,5 @@ #ifndef TOFSPECTRAPPANALYSIS_H -#define TOFSPECTRAPOANALYSIS_H +#define TOFSPECTRAPPANALYSIS_H ////////////////////////////////////////////////////////////////////////////// // // -- 2.43.0