(... supposing build is the name of the build directory).
These seems to solve the rare issue of cmake missing updated headers. It
also requires to add directories in several EINCLUDE declarations, which
were masked up to now by the build/include upstream.
Headers generated from templates are now put in
build/include/FromTemplate, not in build/include directly.
One additional missing dependency
set ( DHDR TenderSuppliesLinkDef.h)
-set ( EINCLUDE ANALYSIS ANALYSIS/Tender TOF TRD/Cal VZERO ANALYSIS/TenderSupplies TPC TRD T0 OADB EMCAL STEER/STEER STEER/CDB STEER/ESD STEER/AOD STEER/STEERBase TPC/Base)
+set ( EINCLUDE ANALYSIS ANALYSIS/Tender ANALYSIS/TenderSupplies TOF TRD/Cal VZERO TPC TRD T0 OADB EMCAL PHOS STEER/STEER STEER/CDB STEER/ESD STEER/AOD STEER/STEERBase TPC/Base)
message("AliRoot sources not downloaded from a Version Control System. I can't tell which revision you are using!")
endif(EXISTS ${PROJECT_SOURCE_DIR}/.git/)
-configure_file(${PROJECT_SOURCE_DIR}/cmake/ARVersion.h.tmp ${CMAKE_INCLUDE_EXPORT_DIRECTORY}/ARVersion.h @ONLY)
+configure_file(${PROJECT_SOURCE_DIR}/cmake/ARVersion.h.tmp ${CMAKE_INCLUDE_EXPORT_DIRECTORY}/FromTemplate/ARVersion.h @ONLY)
string (REPLACE "-" "." ALIROOT_BRANCH_SPEC "${ALIROOT_BRANCH}")
set ( EDEFINE -isystem${FASTJET_INC})
-set ( EINCLUDE ANALYSIS OADB STEER/STEERBase STEER/AOD)
+set ( EINCLUDE ANALYSIS OADB STEER/STEERBase STEER/AOD STEER/ESD EMCAL)
if( ALICE_TARGET STREQUAL "win32gcc")
set ( DHDR MFTbaseLinkDef.h)
-set ( EINCLUDE STRUCT RAW MUON STEER/STEER STEER/AOD STEER/STEERBase)
+set ( EINCLUDE STRUCT RAW MUON STEER/STEER STEER/AOD STEER/STEERBase STEER/CDB)
set ( EXPORT AliMFTAnalysisTools.h AliMFTConstants.h)
set ( DHDR PWGCaloTrackCorrBaseLinkDef.h)
-set ( EINCLUDE PWG/CaloTrackCorrBase EMCAL OADB STEER/AOD STEER/ESD STEER/STEERBase ANALYSIS)
+set ( EINCLUDE PWG/CaloTrackCorrBase EMCAL PHOS OADB STEER/AOD STEER/ESD STEER/STEERBase ANALYSIS)
string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
-set ( EINCLUDE PWG/DevNanoAOD PWGLF/SPECTRA/PiKaPr/TestAOD ANALYSIS CORRFW STEER/AOD STEER/ESD STEER/STEERBase)
+set ( EINCLUDE PWG/DevNanoAOD PWGLF/SPECTRA/PiKaPr/TestAOD ANALYSIS ANALYSIS/ESDfilter CORRFW STEER/AOD STEER/ESD STEER/STEERBase)
if( ALICE_TARGET STREQUAL "win32gcc")
set ( PACKSOFLAGS ${SOFLAGS} )
set ( DHDR PWGEMCALLinkDef.h)
-set ( EINCLUDE PWG/Tools PWG/EMCAL EMCAL OADB STEER/ESD STEER/STEERBase ANALYSIS)
+set ( EINCLUDE PWG/Tools PWG/EMCAL EMCAL OADB STEER/ESD STEER/STEERBase ANALYSIS ANALYSIS/Tender)
install (DIRECTORY EMCAL/data
DESTINATION PWG/EMCAL
set ( EXPORT )
-set ( EINCLUDE PWG/Glauber )
+set ( EINCLUDE PWG/Glauber STEER/STEER)
if( ALICE_TARGET STREQUAL "win32gcc")
set ( ELIBS -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lPWGflowBase -lPWGmuon -lANALYSISalice -lANALYSIS -lAOD -lESD -lSTEERBase ${ROOTCLIBS} -lEG )
endif( ALICE_TARGET STREQUAL "win32gcc")
-set ( EINCLUDE PWG/FLOW/Base PWG/FLOW/Tasks STEER/ESD STEER/AOD STEER/STEERBase PWG/muon ANALYSIS)
+set ( EINCLUDE PWG/FLOW/Base PWG/FLOW/Tasks STEER/ESD STEER/AOD STEER/STEERBase STEER/CDB PWG/muon ANALYSIS)
set ( DHDR PWGmuonLinkDef.h)
-set ( EINCLUDE RooUnfold/src PWG/muon ANALYSIS STEER/AOD STEER/ESD STEER/STEERBase)
+set ( EINCLUDE RooUnfold/src PWG/muon ANALYSIS STEER/AOD STEER/ESD STEER/STEERBase MFT)
if( ALICE_TARGET STREQUAL "win32gcc")
set ( PACKSOFLAGS ${SOFLAGS} )
string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
-set ( EINCLUDE ANALYSIS CORRFW PWGCF/Correlations/Base PWGCF/Correlations/DPhi PWGCF/Correlations/DPhi/FourierDecomposition PWG/Tools STEER/AOD STEER/ESD STEER/STEERBase)
+set ( EINCLUDE ANALYSIS ANALYSIS/ESDfilter CORRFW PWGCF/Correlations/Base PWGCF/Correlations/DPhi PWGCF/Correlations/DPhi/FourierDecomposition PWG/Tools STEER/AOD STEER/ESD STEER/STEERBase)
set ( EXPORT )
-set ( EINCLUDE PWG/Tools ANALYSIS/EventMixing PWGCF/EBYE PWGCF/EBYE/BalanceFunctions PWGCF/EBYE/LRC PWGCF/EBYE/Fluctuations PWGCF/EBYE/NetParticle PWGCF/EBYE/PIDFluctuation/task STEER/STEERBase ANALYSIS CORRFW)
+set ( EINCLUDE PWG/Tools ANALYSIS/EventMixing PWGCF/EBYE PWGCF/EBYE/BalanceFunctions PWGCF/EBYE/LRC PWGCF/EBYE/Fluctuations PWGCF/EBYE/NetParticle PWGCF/EBYE/PIDFluctuation/task STEER/STEER STEER/STEERBase ANALYSIS CORRFW)
set ( DHDR PWGDQdielectronLinkDef.h)
-set ( EINCLUDE PWG/muon PWG/FLOW/Base PWG/FLOW/Tasks PWGDQ/dielectron STEER CORRFW STEER/AOD STEER/CDB STEER/ESD STEER/STEERBase ANALYSIS)
+set ( EINCLUDE PWG/muon PWG/FLOW/Base PWG/FLOW/Tasks PWGDQ/dielectron STEER STEER/STEER CORRFW STEER/AOD STEER/CDB STEER/ESD STEER/STEERBase ANALYSIS TRD)
string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
-set ( EINCLUDE PWGGA/GammaConv CORRFW STEER/AOD STEER/ESD STEER/STEERBase ANALYSIS)
+set ( EINCLUDE PWGGA/GammaConv PWG/TRD CORRFW STEER/AOD STEER/ESD STEER/STEERBase ANALYSIS)
string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
-set ( EINCLUDE PWGGA/PWGGAUtils PWGGA/PHOSTasks/PHOS_pp_pi0 PWGGA/PHOSTasks/CaloCellQA PWGGA/PHOSTasks/omega3pi PHOS STEER/ESD STEER/STEERBase ANALYSIS)
+set ( EINCLUDE PWGGA/PWGGAUtils PWGGA/PHOSTasks/PHOS_pp_pi0 PWGGA/PHOSTasks/CaloCellQA PWGGA/PHOSTasks/omega3pi PWGGA/PHOSTasks/PHOS_PbPb_MC PHOS STEER/ESD STEER/STEERBase ANALYSIS ANALYSIS/Tender)
install (FILES PHOSTasks/CaloCellQA/macros/AddTaskCaloCellsQA.C
PHOSTasks/CaloCellQA/macros/AddTaskPHOSQA.C
set ( DHDR PWGHFhfeLinkDef.h)
-set ( EINCLUDE EMCAL PWG/muon PWGHF/hfe TPC CORRFW STEER/STEERBase PWG/FLOW/Base PWG/FLOW/Tasks ANALYSIS)
+set ( EINCLUDE EMCAL PWG/muon PWG/TRD PWGHF/hfe PWG/CaloTrackCorrBase TPC PHOS CORRFW STEER/STEER STEER/STEERBase PWG/FLOW/Base PWG/FLOW/Tasks ANALYSIS)
string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
if(FASTJET_FOUND)
- set ( EINCLUDE ${FASTJET_INCLUDE_DIR} ANALYSIS JETAN CORRFW PWGJE PWG/Tools PWGCF/Correlations/Base STEER/AOD STEER/ESD STEER/STEERBase)
+ set ( EINCLUDE ${FASTJET_INCLUDE_DIR} ANALYSIS JETAN CORRFW PWGJE PWG/Tools PWG/FLOW/Tasks PWGCF/Correlations/Base STEER/AOD STEER/ESD STEER/STEERBase STEER/CDB STEER/STEER)
set ( HDRS ${HDRS} EMCALJetTasks/FJ_includes.h )
else()
- set ( EINCLUDE ANALYSIS JETAN CORRFW PWGJE PWG/Tools PWG/TRD 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)
endif(FASTJET_FOUND)
if(FASTJET_FOUND)
set ( EDEFINE -isystem${FASTJET_INCLUDE_DIR})
- set ( EINCLUDE ${FASTJET_INCLUDE_DIR} PWGJE/EMCALJetTasks PWG/EMCAL EMCAL OADB STEER/ESD STEER/STEERBase ANALYSIS)
+ set ( EINCLUDE ${FASTJET_INCLUDE_DIR} PWGJE/EMCALJetTasks PWGJE/EMCALJetTasks/UserTasks PWG/EMCAL EMCAL OADB STEER/ESD STEER/STEERBase ANALYSIS)
set ( HDRS ${HDRS} EMCALJetTasks/FJ_includes.h )
else()
- set ( EINCLUDE PWGJE/EMCALJetTasks PWG/EMCAL EMCAL OADB STEER/ESD STEER/STEERBase ANALYSIS)
+ set ( EINCLUDE PWGJE/EMCALJetTasks PWGJE/EMCALJetTasks/UserTasks PWG/EMCAL EMCAL OADB STEER/ESD STEER/STEERBase ANALYSIS)
endif(FASTJET_FOUND)
SET ( EXPORT ${HDRS} )
set ( EXPORT )
-set ( EINCLUDE PWGLF/STRANGENESS/Cascades PWGLF/STRANGENESS/LambdaK0 PWGLF/STRANGENESS/LambdaK0PbPb PWGLF/STRANGENESS/Correlations PWGLF/STRANGENESS/Hypernuclei STEER/ESD STEER/AOD STEER/STEERBase ANALYSIS PWG/FLOW/Base PWG/FLOW/Tasks)
+set ( EINCLUDE PWGLF/STRANGENESS/Cascades PWGLF/STRANGENESS/LambdaK0 PWGLF/STRANGENESS/LambdaK0PbPb PWGLF/STRANGENESS/Correlations PWGLF/STRANGENESS/Hypernuclei PWGCF/Correlations/Base STEER/ESD STEER/AOD STEER/STEERBase ANALYSIS PWG/FLOW/Base PWG/FLOW/Tasks)
#install (DIRECTORY PWGLF/STRANGENESS/Cascades/macros
# DESTINATION PWGLF/STRANGENESS
FORWARD/analysis2
FORWARD/GEO
PWG0
+ OADB
STEER/ESD
STEER/STEERBase)
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/AOD STEER/CDB STEER/STEERBase ANALYSIS)
+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 PWG/Tools)
set ( EXPORT )
-set ( EINCLUDE PWGLF/SPECTRA/PiKaPr/TestAOD TPC TOF STEER/STEER STEER/ESD STEER/AOD STEER/CDB STEER/STEERBase ANALYSIS)
+set ( EINCLUDE PWGLF/SPECTRA/PiKaPr/TestAOD TPC TOF STEER/STEER STEER/ESD STEER/AOD STEER/CDB STEER/STEERBase ANALYSIS ANALYSIS/ESDfilter)
string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" )
-set ( EINCLUDE ANALYSIS PWGUD/base PWGLF/totEt STEER/ESD STEER/STEERBase)
+set ( EINCLUDE ANALYSIS PWGUD/base PWGLF/totEt STEER/ESD STEER/STEERBase PHOS EMCAL)
TOF
TRD/Cal
TRD/info
+ EMCAL
ANALYSIS/Tender
ANALYSIS
PWG/CaloTrackCorrBase
STEER/AOD
STEER/ESD
STEER/STEERBase
+ CORRFW
)
set ( EXPORT UPC/AliUpcParticle.h )
-set ( EINCLUDE PWGUD/UPC STEER/AOD STEER/ESD STEER/STEERBase VZERO ANALYSIS)
+set ( EINCLUDE PWGUD/UPC PWG/muon STEER/AOD STEER/ESD STEER/STEERBase VZERO ANALYSIS)
set ( DHDR PWGUDupcLinkDef.h )
set ( DHDR TEvtGenLinkDef.h)
-set ( EINCLUDE TEvtGen EVGEN STEER/STEER)
+set ( EINCLUDE TEvtGen EVGEN STEER/STEER STEER/STEERBase)
set ( DHDR TRDbaseLinkDef.h)
-set ( EINCLUDE RAW TRD/Cal STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase)
+set ( EINCLUDE RAW TRD/Cal STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase )
if (TRD_RAW_CRC)
message ( STATUS "CRC support for AliTRDrawStream enabled" )
include_directories(SYSTEM ${ROOTINCDIR})
include_directories(${PINC})
include_directories(${EINCLUDE})
- include_directories(${CMAKE_INCLUDE_EXPORT_DIRECTORY})
+ include_directories(${CMAKE_INCLUDE_EXPORT_DIRECTORY}/FromTemplate)
include_directories(${CMAKE_SOURCE_DIR})
add_library(${PACKAGE} SHARED ${PCS} ${PFS} ${PS} ${PDS})