From: hristov Date: Tue, 3 Feb 2015 15:55:09 +0000 (+0100) Subject: Correct use of ROOT_INCLUDE_DIR X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=f0315837c11ca1282b6ceb3c0feb2b10091018ef;p=u%2Fmrichter%2FAliRoot.git Correct use of ROOT_INCLUDE_DIR --- diff --git a/ACORDE/ACORDEbase/CMakeLists.txt b/ACORDE/ACORDEbase/CMakeLists.txt index d7f2dc71f41..443faca8816 100644 --- a/ACORDE/ACORDEbase/CMakeLists.txt +++ b/ACORDE/ACORDEbase/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE ACORDEbase) include_directories(${AliRoot_SOURCE_DIR}/ACORDE/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/RAW/RAWDatasim diff --git a/ACORDE/ACORDErec/CMakeLists.txt b/ACORDE/ACORDErec/CMakeLists.txt index 33b94819af5..2d0f6d84bc6 100644 --- a/ACORDE/ACORDErec/CMakeLists.txt +++ b/ACORDE/ACORDErec/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE ACORDErec) include_directories(${AliRoot_SOURCE_DIR}/ACORDE/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ACORDE/ACORDEbase ${AliRoot_SOURCE_DIR}/ACORDE/ACORDEsim ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase @@ -70,4 +70,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/ACORDE/ACORDEsim/CMakeLists.txt b/ACORDE/ACORDEsim/CMakeLists.txt index 9d0b8025ee1..debc62f46b5 100644 --- a/ACORDE/ACORDEsim/CMakeLists.txt +++ b/ACORDE/ACORDEsim/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE ACORDEsim) include_directories(${AliRoot_SOURCE_DIR}/ACORDE/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ACORDE/ACORDEbase ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec @@ -75,4 +75,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/ANALYSIS/ANALYSISalice/CMakeLists.txt b/ANALYSIS/ANALYSISalice/CMakeLists.txt index b492a8ac277..26ce835fef3 100644 --- a/ANALYSIS/ANALYSISalice/CMakeLists.txt +++ b/ANALYSIS/ANALYSISalice/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE ANALYSISalice) include_directories(${AliRoot_SOURCE_DIR}/ANALYSIS/${MODULE}) # Additional include directories -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS ${AliRoot_SOURCE_DIR}/STEER/AOD ${AliRoot_SOURCE_DIR}/STEER/ESD diff --git a/ANALYSIS/ANALYSIScalib/CMakeLists.txt b/ANALYSIS/ANALYSIScalib/CMakeLists.txt index 2d04ec4e060..c0c794f761d 100644 --- a/ANALYSIS/ANALYSIScalib/CMakeLists.txt +++ b/ANALYSIS/ANALYSIScalib/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE ANALYSIScalib) include_directories(${AliRoot_SOURCE_DIR}/ANALYSIS/${MODULE}) # Additional include folders in alphabetical ordere except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS ${AliRoot_SOURCE_DIR}/STEER/ESD ${AliRoot_SOURCE_DIR}/STEER/STEERBase diff --git a/ANALYSIS/ESDfilter/CMakeLists.txt b/ANALYSIS/ESDfilter/CMakeLists.txt index 9753889e72e..bdc54190f65 100644 --- a/ANALYSIS/ESDfilter/CMakeLists.txt +++ b/ANALYSIS/ESDfilter/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE ESDfilter) include_directories(${AliRoot_SOURCE_DIR}/ANALYSIS/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice ${AliRoot_SOURCE_DIR}/EMCAL/EMCALUtils diff --git a/BCM/CMakeLists.txt b/BCM/CMakeLists.txt index 2d99b631ab4..8dbd2d4f1a0 100644 --- a/BCM/CMakeLists.txt +++ b/BCM/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE BCM) include_directories(${AliRoot_SOURCE_DIR}/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/STEER/STEER ${AliRoot_SOURCE_DIR}/STEER/STEERBase ) diff --git a/DIME/TDime/CMakeLists.txt b/DIME/TDime/CMakeLists.txt index 7e61495e944..0af32b2185a 100644 --- a/DIME/TDime/CMakeLists.txt +++ b/DIME/TDime/CMakeLists.txt @@ -20,7 +20,7 @@ set (MODULE TDime) include_directories(${AliRoot_SOURCE_DIR}/DIME/${MODULE}) # Additional includes - alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS}) +include_directories(${ROOT_INCLUDE_DIR}) # Sources - alphabetical order set(SRCS diff --git a/DIME/dime/CMakeLists.txt b/DIME/dime/CMakeLists.txt index b0a9ab93fd4..eccdcb8c002 100644 --- a/DIME/dime/CMakeLists.txt +++ b/DIME/dime/CMakeLists.txt @@ -21,7 +21,7 @@ include_directories(${AliRoot_SOURCE_DIR}/DIME/${MODULE} ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ) # Sources diff --git a/DPMJET/CMakeLists.txt b/DPMJET/CMakeLists.txt index 2beb6d223bb..46bf175f1bd 100644 --- a/DPMJET/CMakeLists.txt +++ b/DPMJET/CMakeLists.txt @@ -21,7 +21,7 @@ include_directories(${AliRoot_SOURCE_DIR}/${MODULE} ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ) # Sources diff --git a/EMCAL/EMCALUtils/CMakeLists.txt b/EMCAL/EMCALUtils/CMakeLists.txt index d32443294dd..362c98856ef 100644 --- a/EMCAL/EMCALUtils/CMakeLists.txt +++ b/EMCAL/EMCALUtils/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE EMCALUtils) include_directories(${AliRoot_SOURCE_DIR}/EMCAL/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/STEER/AOD ${AliRoot_SOURCE_DIR}/STEER/ESD ${AliRoot_SOURCE_DIR}/STEER/STEERBase diff --git a/EMCAL/EMCALbase/CMakeLists.txt b/EMCAL/EMCALbase/CMakeLists.txt index 8f69ba89952..a95b6b2bd06 100644 --- a/EMCAL/EMCALbase/CMakeLists.txt +++ b/EMCAL/EMCALbase/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE EMCALbase) include_directories(${AliRoot_SOURCE_DIR}/EMCAL/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/EMCAL/EMCALraw ${AliRoot_SOURCE_DIR}/EMCAL/EMCALUtils ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase diff --git a/EMCAL/EMCALraw/CMakeLists.txt b/EMCAL/EMCALraw/CMakeLists.txt index c565fd272b3..ef39e9c2703 100644 --- a/EMCAL/EMCALraw/CMakeLists.txt +++ b/EMCAL/EMCALraw/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE EMCALraw) include_directories(${AliRoot_SOURCE_DIR}/EMCAL/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/EMCAL/EMCALUtils ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec diff --git a/EMCAL/EMCALrec/CMakeLists.txt b/EMCAL/EMCALrec/CMakeLists.txt index 7a41f0785d6..2c76aedd2de 100644 --- a/EMCAL/EMCALrec/CMakeLists.txt +++ b/EMCAL/EMCALrec/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE EMCALrec) include_directories(${AliRoot_SOURCE_DIR}/EMCAL/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/EMCAL/EMCALbase ${AliRoot_SOURCE_DIR}/EMCAL/EMCALraw ${AliRoot_SOURCE_DIR}/EMCAL/EMCALsim @@ -85,4 +85,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/EMCAL/EMCALsim/CMakeLists.txt b/EMCAL/EMCALsim/CMakeLists.txt index 30105b2c9e5..65505b782db 100644 --- a/EMCAL/EMCALsim/CMakeLists.txt +++ b/EMCAL/EMCALsim/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE EMCALsim) include_directories(${AliRoot_SOURCE_DIR}/EMCAL/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/EMCAL/EMCALbase ${AliRoot_SOURCE_DIR}/EMCAL/EMCALUtils ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec @@ -81,4 +81,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/EVGEN/CMakeLists.txt b/EVGEN/CMakeLists.txt index 9e79c2848ab..80cbe5b298b 100644 --- a/EVGEN/CMakeLists.txt +++ b/EVGEN/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE EVGEN) include_directories(${AliRoot_SOURCE_DIR}/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/FASTSIM ${AliRoot_SOURCE_DIR}/LHAPDF ${AliRoot_SOURCE_DIR}/STEER/ESD diff --git a/FASTSIM/CMakeLists.txt b/FASTSIM/CMakeLists.txt index 0a030c9532b..0d8a22b7fac 100644 --- a/FASTSIM/CMakeLists.txt +++ b/FASTSIM/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE FASTSIM) include_directories(${AliRoot_SOURCE_DIR}/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/STEER/STEER ) diff --git a/FMD/FMDbase/CMakeLists.txt b/FMD/FMDbase/CMakeLists.txt index 6554e5e04c8..91e6615157b 100644 --- a/FMD/FMDbase/CMakeLists.txt +++ b/FMD/FMDbase/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE FMDbase) include_directories(${AliRoot_SOURCE_DIR}/FMD/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/STEER/CDB ${AliRoot_SOURCE_DIR}/STEER/ESD diff --git a/FMD/FMDrec/CMakeLists.txt b/FMD/FMDrec/CMakeLists.txt index 9b72de0a99d..82402b2ac92 100644 --- a/FMD/FMDrec/CMakeLists.txt +++ b/FMD/FMDrec/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE FMDrec) include_directories(${AliRoot_SOURCE_DIR}/FMD/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/FMD/FMDbase ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec diff --git a/FMD/FMDsim/CMakeLists.txt b/FMD/FMDsim/CMakeLists.txt index ef1b4bb2359..4f3d2cef70d 100644 --- a/FMD/FMDsim/CMakeLists.txt +++ b/FMD/FMDsim/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE FMDsim) include_directories(${AliRoot_SOURCE_DIR}/FMD/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/FMD/FMDbase ${AliRoot_SOURCE_DIR}/FMD/FMDrec ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase diff --git a/FMD/FMDutil/CMakeLists.txt b/FMD/FMDutil/CMakeLists.txt index 1051d6a1d87..2ac4fbf832d 100644 --- a/FMD/FMDutil/CMakeLists.txt +++ b/FMD/FMDutil/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE FMDutil) include_directories(${AliRoot_SOURCE_DIR}/FMD/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/FMD/FMDbase ${AliRoot_SOURCE_DIR}/FMD/FMDrec ${AliRoot_SOURCE_DIR}/FMD/FMDsim diff --git a/HERWIG/CMakeLists.txt b/HERWIG/CMakeLists.txt index 2e458bcfbea..418ad08fd6f 100644 --- a/HERWIG/CMakeLists.txt +++ b/HERWIG/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE HERWIG) include_directories(${AliRoot_SOURCE_DIR}/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS}) +include_directories(${ROOT_INCLUDE_DIR}) # Sources set(SRCS diff --git a/HIJING/CMakeLists.txt b/HIJING/CMakeLists.txt index fb7b131c0cb..5612510fc64 100644 --- a/HIJING/CMakeLists.txt +++ b/HIJING/CMakeLists.txt @@ -21,7 +21,7 @@ include_directories(${AliRoot_SOURCE_DIR}/${MODULE} ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HIJING/hijing ) diff --git a/HLT/BASE/CMakeLists.txt b/HLT/BASE/CMakeLists.txt index 8aa1106afc2..9cf3c78e821 100644 --- a/HLT/BASE/CMakeLists.txt +++ b/HLT/BASE/CMakeLists.txt @@ -24,7 +24,8 @@ add_subdirectory(util) set(MODULE HLTbase) # Module include folder -include_directories(${AliRoot_SOURCE_DIR}/HLT/BASE +include_directories(${ROOT_INCLUDE_DIR} + ${AliRoot_SOURCE_DIR}/HLT/BASE ) # Additional include folders in alphabetical order except ROOT diff --git a/HLT/BASE/HOMER/CMakeLists.txt b/HLT/BASE/HOMER/CMakeLists.txt index 08a7e97b062..dc1b9495d19 100644 --- a/HLT/BASE/HOMER/CMakeLists.txt +++ b/HLT/BASE/HOMER/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE AliHLTHOMER) include_directories(${AliRoot_SOURCE_DIR}/HLT/BASE/HOMER) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ) # Sources in alphabetical order diff --git a/HLT/BASE/interface/CMakeLists.txt b/HLT/BASE/interface/CMakeLists.txt index 701971b5dca..02510dc3d9e 100644 --- a/HLT/BASE/interface/CMakeLists.txt +++ b/HLT/BASE/interface/CMakeLists.txt @@ -21,7 +21,7 @@ include_directories(${AliRoot_SOURCE_DIR}/HLT/BASE/interface ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HLT/BASE ) @@ -61,4 +61,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/HLT/BASE/util/CMakeLists.txt b/HLT/BASE/util/CMakeLists.txt index 056c47f597a..9fac446c109 100644 --- a/HLT/BASE/util/CMakeLists.txt +++ b/HLT/BASE/util/CMakeLists.txt @@ -21,7 +21,7 @@ include_directories(${AliRoot_SOURCE_DIR}/HLT/BASE/util ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase diff --git a/HLT/EVE/CMakeLists.txt b/HLT/EVE/CMakeLists.txt index d9a63560058..48aac6c6b91 100644 --- a/HLT/EVE/CMakeLists.txt +++ b/HLT/EVE/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE AliHLTEve) include_directories(${AliRoot_SOURCE_DIR}/HLT/EVE) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/EMCAL/EMCALUtils ${AliRoot_SOURCE_DIR}/EVE/EveBase ${AliRoot_SOURCE_DIR}/EVE/EveDet diff --git a/HLT/FMD/CMakeLists.txt b/HLT/FMD/CMakeLists.txt index 379a4ab96e8..59c5ed6c413 100644 --- a/HLT/FMD/CMakeLists.txt +++ b/HLT/FMD/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE AliHLTFMD) include_directories(${AliRoot_SOURCE_DIR}/HLT/FMD) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/FMD/FMDbase ${AliRoot_SOURCE_DIR}/FMD/FMDrec ${AliRoot_SOURCE_DIR}/HLT/BASE diff --git a/HLT/ITS/CMakeLists.txt b/HLT/ITS/CMakeLists.txt index 869218563bc..8039adde0fc 100644 --- a/HLT/ITS/CMakeLists.txt +++ b/HLT/ITS/CMakeLists.txt @@ -25,7 +25,7 @@ include_directories(${AliRoot_SOURCE_DIR}/HLT/ITS ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/HLT/BASE/util ${AliRoot_SOURCE_DIR}/ITS/ITSbase diff --git a/HLT/MUON/CMakeLists.txt b/HLT/MUON/CMakeLists.txt index cc50a51d765..9e12828c81a 100644 --- a/HLT/MUON/CMakeLists.txt +++ b/HLT/MUON/CMakeLists.txt @@ -23,7 +23,7 @@ include_directories(${AliRoot_SOURCE_DIR}/HLT/MUON ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/MUON/MUONbase ${AliRoot_SOURCE_DIR}/MUON/MUONcalib diff --git a/HLT/PHOS/CMakeLists.txt b/HLT/PHOS/CMakeLists.txt index 1f5159c6378..081e372a936 100644 --- a/HLT/PHOS/CMakeLists.txt +++ b/HLT/PHOS/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE AliHLTPHOS) include_directories(${AliRoot_SOURCE_DIR}/HLT/PHOS) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/EMCAL/EMCALraw ${AliRoot_SOURCE_DIR}/EMCAL/EMCALUtils ${AliRoot_SOURCE_DIR}/HLT/BASE diff --git a/HLT/QA/CMakeLists.txt b/HLT/QA/CMakeLists.txt index 90d52ec482f..dedb24f5b7c 100644 --- a/HLT/QA/CMakeLists.txt +++ b/HLT/QA/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE HLTqadm) include_directories(${AliRoot_SOURCE_DIR}/HLT/QA) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/STEER/ESD ${AliRoot_SOURCE_DIR}/STEER/STEER diff --git a/HLT/RCU/CMakeLists.txt b/HLT/RCU/CMakeLists.txt index 624915893bc..0c76bbd192a 100644 --- a/HLT/RCU/CMakeLists.txt +++ b/HLT/RCU/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE AliHLTRCU) include_directories(${AliRoot_SOURCE_DIR}/HLT/RCU) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec diff --git a/HLT/SampleLib/CMakeLists.txt b/HLT/SampleLib/CMakeLists.txt index 39ba2690da2..eb842df5d1c 100644 --- a/HLT/SampleLib/CMakeLists.txt +++ b/HLT/SampleLib/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE AliHLTSample) include_directories(${AliRoot_SOURCE_DIR}/HLT/SampleLib) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec diff --git a/HLT/TPCLib/CMakeLists.txt b/HLT/TPCLib/CMakeLists.txt index d22f3daa4f5..1ea623ba118 100644 --- a/HLT/TPCLib/CMakeLists.txt +++ b/HLT/TPCLib/CMakeLists.txt @@ -43,7 +43,7 @@ include_directories(${AliRoot_SOURCE_DIR}/HLT/TPCLib ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/HLT/BASE/util diff --git a/HLT/TPCLib/EVE/CMakeLists.txt b/HLT/TPCLib/EVE/CMakeLists.txt index 78af1558ad1..255daa3382c 100644 --- a/HLT/TPCLib/EVE/CMakeLists.txt +++ b/HLT/TPCLib/EVE/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE AliHLTTPCEVE) include_directories(${AliRoot_SOURCE_DIR}/HLT/TPCLib/EVE) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/HLT/TPCLib ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase diff --git a/HLT/TPCLib/calibration/CMakeLists.txt b/HLT/TPCLib/calibration/CMakeLists.txt index 229c0430ddc..e9a85f5b0b8 100644 --- a/HLT/TPCLib/calibration/CMakeLists.txt +++ b/HLT/TPCLib/calibration/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE AliHLTTPCCalibration) include_directories(${AliRoot_SOURCE_DIR}/HLT/TPCLib/calibration) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/HLT/BASE/util diff --git a/HLT/TPCLib/tracking-ca/cagpu/cuda/CMakeLists.txt b/HLT/TPCLib/tracking-ca/cagpu/cuda/CMakeLists.txt index 05927ea912a..ea87ef8005b 100644 --- a/HLT/TPCLib/tracking-ca/cagpu/cuda/CMakeLists.txt +++ b/HLT/TPCLib/tracking-ca/cagpu/cuda/CMakeLists.txt @@ -34,7 +34,7 @@ include_directories(${AliRoot_SOURCE_DIR}/HLT/TPCLib/tracking-ca/cagpu/cuda ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HLT/BASE ) @@ -99,4 +99,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/HLT/TPCLib/tracking-ca/cagpu/opencl/CMakeLists.txt b/HLT/TPCLib/tracking-ca/cagpu/opencl/CMakeLists.txt index ea4a420aa91..23e3101994c 100644 --- a/HLT/TPCLib/tracking-ca/cagpu/opencl/CMakeLists.txt +++ b/HLT/TPCLib/tracking-ca/cagpu/opencl/CMakeLists.txt @@ -78,7 +78,7 @@ include_directories(${AliRoot_SOURCE_DIR}/HLT/TPCLib/tracking-ca/cagpu/opencl ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HLT/BASE ${AMDAPPSDKROOT}/include ) @@ -120,4 +120,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/HLT/TRD/CMakeLists.txt b/HLT/TRD/CMakeLists.txt index 7633f4df1f6..8dbcbb6aebd 100644 --- a/HLT/TRD/CMakeLists.txt +++ b/HLT/TRD/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE AliHLTTRD) include_directories(${AliRoot_SOURCE_DIR}/HLT/TRD) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/HLT/BASE/util ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase diff --git a/HLT/VZERO/CMakeLists.txt b/HLT/VZERO/CMakeLists.txt index e745cd6ee1b..49a05689b09 100644 --- a/HLT/VZERO/CMakeLists.txt +++ b/HLT/VZERO/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE AliHLTVZERO) include_directories(${AliRoot_SOURCE_DIR}/HLT/VZERO) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec diff --git a/HLT/ZDC/CMakeLists.txt b/HLT/ZDC/CMakeLists.txt index e92b1108c87..4119255d94e 100644 --- a/HLT/ZDC/CMakeLists.txt +++ b/HLT/ZDC/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE AliHLTZDC) include_directories(${AliRoot_SOURCE_DIR}/HLT/ZDC) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec diff --git a/HLT/comp/CMakeLists.txt b/HLT/comp/CMakeLists.txt index aafd3f34f65..0c00019662c 100644 --- a/HLT/comp/CMakeLists.txt +++ b/HLT/comp/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE AliHLTComp) include_directories(${AliRoot_SOURCE_DIR}/HLT/comp) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HLT/BASE ) diff --git a/HLT/global/CMakeLists.txt b/HLT/global/CMakeLists.txt index 1bf5cc42ecc..369b047105e 100644 --- a/HLT/global/CMakeLists.txt +++ b/HLT/global/CMakeLists.txt @@ -22,7 +22,7 @@ include_directories(${AliRoot_SOURCE_DIR}/HLT/global ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice ${AliRoot_SOURCE_DIR}/ITS/ITSrec ${AliRoot_SOURCE_DIR}/HLT/BASE diff --git a/HLT/pendolino/CMakeLists.txt b/HLT/pendolino/CMakeLists.txt index ad0a8179061..0859ba19d30 100644 --- a/HLT/pendolino/CMakeLists.txt +++ b/HLT/pendolino/CMakeLists.txt @@ -22,7 +22,7 @@ include_directories(${AliRoot_SOURCE_DIR}/HLT/pendolino ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/STEER/CDB ${AliRoot_SOURCE_DIR}/STEER/STEER diff --git a/HLT/rec/CMakeLists.txt b/HLT/rec/CMakeLists.txt index 177888b06af..cf456efcd0e 100644 --- a/HLT/rec/CMakeLists.txt +++ b/HLT/rec/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE HLTrec) include_directories(${AliRoot_SOURCE_DIR}/HLT/rec) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/HLT/BASE/HOMER ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase diff --git a/HLT/shuttle/CMakeLists.txt b/HLT/shuttle/CMakeLists.txt index 678e596aefb..7b2d80595c8 100644 --- a/HLT/shuttle/CMakeLists.txt +++ b/HLT/shuttle/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE HLTshuttle) include_directories(${AliRoot_SOURCE_DIR}/HLT/shuttle) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/STEER/CDB ) diff --git a/HLT/sim/CMakeLists.txt b/HLT/sim/CMakeLists.txt index e28fc671a50..f6e5f1a24ab 100644 --- a/HLT/sim/CMakeLists.txt +++ b/HLT/sim/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE HLTsim) include_directories(${AliRoot_SOURCE_DIR}/HLT/sim) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/HLT/BASE/HOMER ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase diff --git a/HLT/trigger/CMakeLists.txt b/HLT/trigger/CMakeLists.txt index 5aecc6493df..3ab07b7cadf 100644 --- a/HLT/trigger/CMakeLists.txt +++ b/HLT/trigger/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE AliHLTTrigger) include_directories(${AliRoot_SOURCE_DIR}/HLT/trigger) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/HLT/BASE/util diff --git a/HMPID/HMPIDbase/CMakeLists.txt b/HMPID/HMPIDbase/CMakeLists.txt index 2b34e430994..6b49c8a8a62 100644 --- a/HMPID/HMPIDbase/CMakeLists.txt +++ b/HMPID/HMPIDbase/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE HMPIDbase) include_directories(${AliRoot_SOURCE_DIR}/HMPID/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/RAW/RAWDatasim diff --git a/HMPID/HMPIDrec/CMakeLists.txt b/HMPID/HMPIDrec/CMakeLists.txt index 29e22da33dc..5b95e41924e 100644 --- a/HMPID/HMPIDrec/CMakeLists.txt +++ b/HMPID/HMPIDrec/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE HMPIDrec) include_directories(${AliRoot_SOURCE_DIR}/HMPID/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HMPID/HMPIDbase ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec @@ -76,4 +76,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/HMPID/HMPIDsim/CMakeLists.txt b/HMPID/HMPIDsim/CMakeLists.txt index 50165e8312e..4d8e091dff7 100644 --- a/HMPID/HMPIDsim/CMakeLists.txt +++ b/HMPID/HMPIDsim/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE HMPIDsim) include_directories(${AliRoot_SOURCE_DIR}/HMPID/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HMPID/HMPIDbase ${AliRoot_SOURCE_DIR}/HMPID/HMPIDrec ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase @@ -75,4 +75,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/ITS/ITSbase/CMakeLists.txt b/ITS/ITSbase/CMakeLists.txt index 4db1d782dc7..5521d401b16 100644 --- a/ITS/ITSbase/CMakeLists.txt +++ b/ITS/ITSbase/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE ITSbase) include_directories(${AliRoot_SOURCE_DIR}/ITS/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/RAW/RAWDatasim diff --git a/ITS/ITSrec/CMakeLists.txt b/ITS/ITSrec/CMakeLists.txt index aedd609b829..4c0f68f88a4 100644 --- a/ITS/ITSrec/CMakeLists.txt +++ b/ITS/ITSrec/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE ITSrec) include_directories(${AliRoot_SOURCE_DIR}/ITS/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ITS/ITSbase ${AliRoot_SOURCE_DIR}/ITS/ITSsim ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase diff --git a/ITS/ITSsim/CMakeLists.txt b/ITS/ITSsim/CMakeLists.txt index 3d74d9ce42e..0e0a9fd2979 100644 --- a/ITS/ITSsim/CMakeLists.txt +++ b/ITS/ITSsim/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE ITSsim) include_directories(${AliRoot_SOURCE_DIR}/ITS/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ITS/ITSbase ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec diff --git a/ITS/UPGRADE/ITSUpgradeBase/CMakeLists.txt b/ITS/UPGRADE/ITSUpgradeBase/CMakeLists.txt index 597268de34f..a2fd707f975 100644 --- a/ITS/UPGRADE/ITSUpgradeBase/CMakeLists.txt +++ b/ITS/UPGRADE/ITSUpgradeBase/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE ITSUpgradeBase) include_directories(${AliRoot_SOURCE_DIR}/ITS/UPGRADE/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ITS/ITSbase ${AliRoot_SOURCE_DIR}/STEER/ESD ${AliRoot_SOURCE_DIR}/STEER/STEER @@ -74,4 +74,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/ITS/UPGRADE/ITSUpgradeRec/CMakeLists.txt b/ITS/UPGRADE/ITSUpgradeRec/CMakeLists.txt index 9d9b6e3a036..52a166cde40 100644 --- a/ITS/UPGRADE/ITSUpgradeRec/CMakeLists.txt +++ b/ITS/UPGRADE/ITSUpgradeRec/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE ITSUpgradeRec) include_directories(${AliRoot_SOURCE_DIR}/ITS/UPGRADE/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ITS/ITSbase ${AliRoot_SOURCE_DIR}/ITS/ITSrec ${AliRoot_SOURCE_DIR}/ITS/UPGRADE/ITSUpgradeBase diff --git a/ITS/UPGRADE/ITSUpgradeSim/CMakeLists.txt b/ITS/UPGRADE/ITSUpgradeSim/CMakeLists.txt index 75b264c78e6..ca3b08547f0 100644 --- a/ITS/UPGRADE/ITSUpgradeSim/CMakeLists.txt +++ b/ITS/UPGRADE/ITSUpgradeSim/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE ITSUpgradeSim) include_directories(${AliRoot_SOURCE_DIR}/ITS/UPGRADE/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ITS/ITSbase ${AliRoot_SOURCE_DIR}/ITS/ITSsim ${AliRoot_SOURCE_DIR}/ITS/UPGRADE/ITSUpgradeBase @@ -81,4 +81,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/LHAPDF/lhapdf-5.9.1/CMakeLists.txt b/LHAPDF/lhapdf-5.9.1/CMakeLists.txt index c0b2e198641..ba11c1e19fc 100644 --- a/LHAPDF/lhapdf-5.9.1/CMakeLists.txt +++ b/LHAPDF/lhapdf-5.9.1/CMakeLists.txt @@ -23,7 +23,7 @@ include_directories(${AliRoot_SOURCE_DIR}/LHAPDF/lhapdf-5.9.1 ) # Additional include folders in alphabetical order except ROOT -include_directories( +include_directories(${ROOT_INCLUDE_DIR} ) # Sources in alphabetical order diff --git a/LHAPDF/lhapdf5.5.1/CMakeLists.txt b/LHAPDF/lhapdf5.5.1/CMakeLists.txt index a54ddc24ec4..39ea780a643 100644 --- a/LHAPDF/lhapdf5.5.1/CMakeLists.txt +++ b/LHAPDF/lhapdf5.5.1/CMakeLists.txt @@ -23,7 +23,7 @@ include_directories(${AliRoot_SOURCE_DIR}/LHAPDF/lhapdf5.5.1 ) # Additional include folders in alphabetical order -include_directories( +include_directories(${ROOT_INCLUDE_DIR} ) # Sources in alphabetical order diff --git a/MICROCERN/CMakeLists.txt b/MICROCERN/CMakeLists.txt index e855e35c7a1..df83a70ec27 100644 --- a/MICROCERN/CMakeLists.txt +++ b/MICROCERN/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE microcern) include_directories(${AliRoot_SOURCE_DIR}/MICROCERN) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ) # Sources in alphabetical order diff --git a/MONITOR/monitorGDC/CMakeLists.txt b/MONITOR/monitorGDC/CMakeLists.txt index 8d4f9f5b883..3ded823d73f 100644 --- a/MONITOR/monitorGDC/CMakeLists.txt +++ b/MONITOR/monitorGDC/CMakeLists.txt @@ -20,7 +20,8 @@ include_directories(${AliRoot_SOURCE_DIR}/MONITOR/${MODULE} ) # Additional include folders in alphabetical order -include_directories(${AliRoot_SOURCE_DIR} +include_directories(${ROOT_INCLUDE_DIR} + ${AliRoot_SOURCE_DIR} ) if(DATE_FOUND) @@ -78,4 +79,4 @@ set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}") # Installation -install(TARGETS ${MODULE} RUNTIME DESTINATION bin) \ No newline at end of file +install(TARGETS ${MODULE} RUNTIME DESTINATION bin) diff --git a/MUON/MUONbase/CMakeLists.txt b/MUON/MUONbase/CMakeLists.txt index 01bd62bf683..07939eb8c9f 100644 --- a/MUON/MUONbase/CMakeLists.txt +++ b/MUON/MUONbase/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE MUONbase) include_directories(${AliRoot_SOURCE_DIR}/MUON/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/MUON/MUONcalib ${AliRoot_SOURCE_DIR}/MUON/MUONcore ${AliRoot_SOURCE_DIR}/MUON/MUONgeometry diff --git a/MUON/MUONcalib/CMakeLists.txt b/MUON/MUONcalib/CMakeLists.txt index 116905b902f..b62b6dff481 100644 --- a/MUON/MUONcalib/CMakeLists.txt +++ b/MUON/MUONcalib/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE MUONcalib) include_directories(${AliRoot_SOURCE_DIR}/MUON/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/MUON/MUONcore ${AliRoot_SOURCE_DIR}/MUON/MUONmapping ${AliRoot_SOURCE_DIR}/STEER/CDB diff --git a/MUON/MUONcalign/CMakeLists.txt b/MUON/MUONcalign/CMakeLists.txt index 00ac7b29673..bd82e0b7c15 100644 --- a/MUON/MUONcalign/CMakeLists.txt +++ b/MUON/MUONcalign/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE MUONcalign) include_directories(${AliRoot_SOURCE_DIR}/MUON/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice ${AliRoot_SOURCE_DIR}/MUON/MUONbase @@ -78,4 +78,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/MUON/MUONcore/CMakeLists.txt b/MUON/MUONcore/CMakeLists.txt index 01b0bb9ba03..133daca176c 100644 --- a/MUON/MUONcore/CMakeLists.txt +++ b/MUON/MUONcore/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE MUONcore) include_directories(${AliRoot_SOURCE_DIR}/MUON/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/STEER/STEERBase ) diff --git a/MUON/MUONevaluation/CMakeLists.txt b/MUON/MUONevaluation/CMakeLists.txt index dc584546dda..0c9432f36b8 100644 --- a/MUON/MUONevaluation/CMakeLists.txt +++ b/MUON/MUONevaluation/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE MUONevaluation) include_directories(${AliRoot_SOURCE_DIR}/MUON/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/MUON/MUONbase ${AliRoot_SOURCE_DIR}/MUON/MUONcalib ${AliRoot_SOURCE_DIR}/MUON/MUONcore @@ -84,4 +84,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/MUON/MUONgeometry/CMakeLists.txt b/MUON/MUONgeometry/CMakeLists.txt index a619681c598..545b6595b62 100644 --- a/MUON/MUONgeometry/CMakeLists.txt +++ b/MUON/MUONgeometry/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE MUONgeometry) include_directories(${AliRoot_SOURCE_DIR}/MUON/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/MUON/MUONcore ${AliRoot_SOURCE_DIR}/MUON/MUONmapping ${AliRoot_SOURCE_DIR}/STEER/CDB diff --git a/MUON/MUONgraphics/CMakeLists.txt b/MUON/MUONgraphics/CMakeLists.txt index 6b08196026b..479d0e5fbbc 100644 --- a/MUON/MUONgraphics/CMakeLists.txt +++ b/MUON/MUONgraphics/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE MUONgraphics) include_directories(${AliRoot_SOURCE_DIR}/MUON/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/MUON/MUONbase ${AliRoot_SOURCE_DIR}/MUON/MUONcalib ${AliRoot_SOURCE_DIR}/MUON/MUONcore @@ -113,4 +113,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/MUON/MUONmapping/CMakeLists.txt b/MUON/MUONmapping/CMakeLists.txt index 15459956412..87084a558a6 100644 --- a/MUON/MUONmapping/CMakeLists.txt +++ b/MUON/MUONmapping/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE MUONmapping) include_directories(${AliRoot_SOURCE_DIR}/MUON/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/MUON/MUONcore ${AliRoot_SOURCE_DIR}/STEER/CDB ${AliRoot_SOURCE_DIR}/STEER/STEERBase diff --git a/MUON/MUONmpgraphics/CMakeLists.txt b/MUON/MUONmpgraphics/CMakeLists.txt index e515a3797f6..d349caed1ab 100644 --- a/MUON/MUONmpgraphics/CMakeLists.txt +++ b/MUON/MUONmpgraphics/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE MUONmpgraphics) include_directories(${AliRoot_SOURCE_DIR}/MUON/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/MUON/MUONcore ${AliRoot_SOURCE_DIR}/MUON/MUONmapping ${AliRoot_SOURCE_DIR}/STEER/STEERBase @@ -75,4 +75,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/MUON/MUONraw/CMakeLists.txt b/MUON/MUONraw/CMakeLists.txt index c0a5c6f643b..bae65763d3d 100644 --- a/MUON/MUONraw/CMakeLists.txt +++ b/MUON/MUONraw/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE MUONraw) include_directories(${AliRoot_SOURCE_DIR}/MUON/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/MUON/MUONcore ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec diff --git a/MUON/MUONrec/CMakeLists.txt b/MUON/MUONrec/CMakeLists.txt index bb836330e3f..4bafeae4ad4 100644 --- a/MUON/MUONrec/CMakeLists.txt +++ b/MUON/MUONrec/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE MUONrec) include_directories(${AliRoot_SOURCE_DIR}/MUON/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/MUON/MUONbase ${AliRoot_SOURCE_DIR}/MUON/MUONcalib ${AliRoot_SOURCE_DIR}/MUON/MUONcore @@ -118,4 +118,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/MUON/MUONshuttle/CMakeLists.txt b/MUON/MUONshuttle/CMakeLists.txt index c454a9f8e1d..bf4d0e536ce 100644 --- a/MUON/MUONshuttle/CMakeLists.txt +++ b/MUON/MUONshuttle/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE MUONshuttle) include_directories(${AliRoot_SOURCE_DIR}/MUON/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/MUON/MUONbase ${AliRoot_SOURCE_DIR}/MUON/MUONcalib ${AliRoot_SOURCE_DIR}/MUON/MUONcore diff --git a/MUON/MUONsim/CMakeLists.txt b/MUON/MUONsim/CMakeLists.txt index c9ec460fe6f..851504991b3 100644 --- a/MUON/MUONsim/CMakeLists.txt +++ b/MUON/MUONsim/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE MUONsim) include_directories(${AliRoot_SOURCE_DIR}/MUON/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/MUON/MUONbase ${AliRoot_SOURCE_DIR}/MUON/MUONcalib ${AliRoot_SOURCE_DIR}/MUON/MUONcore diff --git a/MUON/MUONtrigger/CMakeLists.txt b/MUON/MUONtrigger/CMakeLists.txt index 4c27f81324e..ea61c2753b2 100644 --- a/MUON/MUONtrigger/CMakeLists.txt +++ b/MUON/MUONtrigger/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE MUONtrigger) include_directories(${AliRoot_SOURCE_DIR}/MUON/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/MUON/MUONcalib ${AliRoot_SOURCE_DIR}/MUON/MUONcore ${AliRoot_SOURCE_DIR}/MUON/MUONmapping diff --git a/PHOS/PHOSUtils/CMakeLists.txt b/PHOS/PHOSUtils/CMakeLists.txt index 90ad18fe697..bc2c66a2aea 100644 --- a/PHOS/PHOSUtils/CMakeLists.txt +++ b/PHOS/PHOSUtils/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE PHOSUtils) include_directories(${AliRoot_SOURCE_DIR}/PHOS/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/STEER/STEERBase ) diff --git a/PHOS/PHOSbase/CMakeLists.txt b/PHOS/PHOSbase/CMakeLists.txt index 4d980bdd76d..311329a7e7e 100644 --- a/PHOS/PHOSbase/CMakeLists.txt +++ b/PHOS/PHOSbase/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE PHOSbase) include_directories(${AliRoot_SOURCE_DIR}/PHOS/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/RAW/RAWDatasim diff --git a/PHOS/PHOSpi0Calib/CMakeLists.txt b/PHOS/PHOSpi0Calib/CMakeLists.txt index f76f66b564f..267556be16b 100644 --- a/PHOS/PHOSpi0Calib/CMakeLists.txt +++ b/PHOS/PHOSpi0Calib/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE PHOSpi0Calib) include_directories(${AliRoot_SOURCE_DIR}/PHOS/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice ${AliRoot_SOURCE_DIR}/PHOS/PHOSbase @@ -68,4 +68,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/PHOS/PHOSrec/CMakeLists.txt b/PHOS/PHOSrec/CMakeLists.txt index d75afb4a119..7d6dbe00910 100644 --- a/PHOS/PHOSrec/CMakeLists.txt +++ b/PHOS/PHOSrec/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE PHOSrec) include_directories(${AliRoot_SOURCE_DIR}/PHOS/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/PHOS/PHOSbase ${AliRoot_SOURCE_DIR}/PHOS/PHOSUtils ${AliRoot_SOURCE_DIR}/PHOS/PHOSsim diff --git a/PHOS/PHOSshuttle/CMakeLists.txt b/PHOS/PHOSshuttle/CMakeLists.txt index 1d460fbf13d..958cd5722e0 100644 --- a/PHOS/PHOSshuttle/CMakeLists.txt +++ b/PHOS/PHOSshuttle/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE PHOSshuttle) include_directories(${AliRoot_SOURCE_DIR}/PHOS/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/PHOS/PHOSbase ${AliRoot_SOURCE_DIR}/STEER/CDB ${AliRoot_SOURCE_DIR}/STEER/STEERBase diff --git a/PHOS/PHOSsim/CMakeLists.txt b/PHOS/PHOSsim/CMakeLists.txt index a426d9b851e..f9ec7edcbeb 100644 --- a/PHOS/PHOSsim/CMakeLists.txt +++ b/PHOS/PHOSsim/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE PHOSsim) include_directories(${AliRoot_SOURCE_DIR}/PHOS/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/RAW/RAWDatasim diff --git a/PMD/PMDbase/CMakeLists.txt b/PMD/PMDbase/CMakeLists.txt index b3bd937c0d9..b1275c10118 100644 --- a/PMD/PMDbase/CMakeLists.txt +++ b/PMD/PMDbase/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE PMDbase) include_directories(${AliRoot_SOURCE_DIR}/PMD/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/STEER/CDB diff --git a/PMD/PMDrec/CMakeLists.txt b/PMD/PMDrec/CMakeLists.txt index 38c8ff11eb5..0cf7a4bf64c 100644 --- a/PMD/PMDrec/CMakeLists.txt +++ b/PMD/PMDrec/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE PMDrec) include_directories(${AliRoot_SOURCE_DIR}/PMD/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/PMD/PMDbase ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec diff --git a/PMD/PMDsim/CMakeLists.txt b/PMD/PMDsim/CMakeLists.txt index 5ea3d22a272..f7d6a8c989b 100644 --- a/PMD/PMDsim/CMakeLists.txt +++ b/PMD/PMDsim/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE PMDsim) include_directories(${AliRoot_SOURCE_DIR}/PMD/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatasim ${AliRoot_SOURCE_DIR}/PMD/PMDbase @@ -74,4 +74,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/PYTHIA6/AliPythia6/CMakeLists.txt b/PYTHIA6/AliPythia6/CMakeLists.txt index c868908eca1..da42241860b 100644 --- a/PYTHIA6/AliPythia6/CMakeLists.txt +++ b/PYTHIA6/AliPythia6/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE AliPythia6) include_directories(${AliRoot_SOURCE_DIR}/PYTHIA6/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/EVGEN ${AliRoot_SOURCE_DIR}/FASTSIM ${AliRoot_SOURCE_DIR}/LHAPDF diff --git a/PYTHIA6/QPYTHIA/CMakeLists.txt b/PYTHIA6/QPYTHIA/CMakeLists.txt index 5e2cc9631de..da78ba97a75 100644 --- a/PYTHIA6/QPYTHIA/CMakeLists.txt +++ b/PYTHIA6/QPYTHIA/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE qpythia) include_directories(${AliRoot_SOURCE_DIR}/PYTHIA6/QPYTHIA) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/FASTSIM ${AliRoot_SOURCE_DIR}/PYTHIA6/pythia6 ) diff --git a/PYTHIA6/pythia6.4.21/CMakeLists.txt b/PYTHIA6/pythia6.4.21/CMakeLists.txt index 05b3a949bf4..78202e16266 100644 --- a/PYTHIA6/pythia6.4.21/CMakeLists.txt +++ b/PYTHIA6/pythia6.4.21/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE pythia6.4.21) include_directories(${AliRoot_SOURCE_DIR}/PYTHIA6/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/PYTHIA6/pythia6 ) diff --git a/PYTHIA6/pythia6.4.25/CMakeLists.txt b/PYTHIA6/pythia6.4.25/CMakeLists.txt index ff04ff0b0d1..bfc4e99a71b 100644 --- a/PYTHIA6/pythia6.4.25/CMakeLists.txt +++ b/PYTHIA6/pythia6.4.25/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE pythia6.4.25) include_directories(${AliRoot_SOURCE_DIR}/PYTHIA6/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/PYTHIA6/pythia6 ) diff --git a/PYTHIA6/pythia6/CMakeLists.txt b/PYTHIA6/pythia6/CMakeLists.txt index 3027e57b472..dd2d321656b 100644 --- a/PYTHIA6/pythia6/CMakeLists.txt +++ b/PYTHIA6/pythia6/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE pythia6) include_directories(${AliRoot_SOURCE_DIR}/PYTHIA6/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ) # Sources in alphabetical order @@ -76,4 +76,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/PYTHIA8/AliPythia8/CMakeLists.txt b/PYTHIA8/AliPythia8/CMakeLists.txt index 69d6a85649e..5284eb9a507 100644 --- a/PYTHIA8/AliPythia8/CMakeLists.txt +++ b/PYTHIA8/AliPythia8/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE AliPythia8) include_directories(${AliRoot_SOURCE_DIR}/PYTHIA8/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/EVGEN ${AliRoot_SOURCE_DIR}/LHAPDF ${AliRoot_SOURCE_DIR}/PYTHIA6/AliPythia6 diff --git a/PYTHIA8/pythia8175/CMakeLists.txt b/PYTHIA8/pythia8175/CMakeLists.txt index fec2f6ba0dc..8a151f23fab 100644 --- a/PYTHIA8/pythia8175/CMakeLists.txt +++ b/PYTHIA8/pythia8175/CMakeLists.txt @@ -20,7 +20,7 @@ set (MODULE pythia8175) include_directories(${AliRoot_SOURCE_DIR}/PYTHIA8/${MODULE}) # Additional includes - alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/PYTHIA8/${MODULE}/include ) diff --git a/RAW/RAWDatabase/CMakeLists.txt b/RAW/RAWDatabase/CMakeLists.txt index 378f0256f69..750538e680a 100644 --- a/RAW/RAWDatabase/CMakeLists.txt +++ b/RAW/RAWDatabase/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE RAWDatabase) include_directories(${AliRoot_SOURCE_DIR}/RAW/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/STEER/ESD ${AliRoot_SOURCE_DIR}/STEER/STEERBase ) diff --git a/RAW/RAWDatarec/CMakeLists.txt b/RAW/RAWDatarec/CMakeLists.txt index cdd6171a785..77ac41b4679 100644 --- a/RAW/RAWDatarec/CMakeLists.txt +++ b/RAW/RAWDatarec/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE RAWDatarec) include_directories(${AliRoot_SOURCE_DIR}/RAW/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/dateStream ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/STEER/ESD diff --git a/RAW/RAWDatarecOnline/CMakeLists.txt b/RAW/RAWDatarecOnline/CMakeLists.txt index 4f3debec41c..b667d0c36e7 100644 --- a/RAW/RAWDatarecOnline/CMakeLists.txt +++ b/RAW/RAWDatarecOnline/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE RAWDatarecOnline) include_directories(${AliRoot_SOURCE_DIR}/RAW/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/STEER/ESD diff --git a/RAW/RAWDatasim/CMakeLists.txt b/RAW/RAWDatasim/CMakeLists.txt index 7de9d8ba758..d30313aa772 100644 --- a/RAW/RAWDatasim/CMakeLists.txt +++ b/RAW/RAWDatasim/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE RAWDatasim) include_directories(${AliRoot_SOURCE_DIR}/RAW/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/STEER/STEER ${AliRoot_SOURCE_DIR}/STEER/STEERBase diff --git a/RAW/alimdc/CMakeLists.txt b/RAW/alimdc/CMakeLists.txt index c8cfd77a339..17ac97b1db0 100644 --- a/RAW/alimdc/CMakeLists.txt +++ b/RAW/alimdc/CMakeLists.txt @@ -18,7 +18,7 @@ set (MODULE alimdc) include_directories(${AliRoot_SOURCE_DIR}/${MODULE}) # Aditional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/MDC ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec diff --git a/RAW/alirawdump/CMakeLists.txt b/RAW/alirawdump/CMakeLists.txt index aeaa8b4a504..ed55380066b 100644 --- a/RAW/alirawdump/CMakeLists.txt +++ b/RAW/alirawdump/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE alirawdump) include_directories(${AliRoot_SOURCE_DIR}/RAW/${MODULE}) # Module aditional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/STEER/STEERBase @@ -37,4 +37,4 @@ add_executable(${MODULE} alirawdump_main.cxx) target_link_libraries(${MODULE} STEERBase RAWDatabase ${ROOTEXTRALIBS} ${ROOT_LIBRARIES}) # Installation -install(TARGETS ${MODULE} RUNTIME DESTINATION bin) \ No newline at end of file +install(TARGETS ${MODULE} RUNTIME DESTINATION bin) diff --git a/STAT/CMakeLists.txt b/STAT/CMakeLists.txt index 6ad2e5db723..22c67742d34 100644 --- a/STAT/CMakeLists.txt +++ b/STAT/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE STAT) include_directories(${AliRoot_SOURCE_DIR}/${MODULE}) # Additional include directories in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/STEER/STEERBase ) # Sources in alphabetical order @@ -70,4 +70,4 @@ install(FILES ${HDRS} DESTINATION include) # Macros install(DIRECTORY Macros DESTINATION STAT) -message(STATUS "${MODULE} enabled") \ No newline at end of file +message(STATUS "${MODULE} enabled") diff --git a/STEER/AOD/CMakeLists.txt b/STEER/AOD/CMakeLists.txt index ca9319faf90..97d79ed1ad4 100644 --- a/STEER/AOD/CMakeLists.txt +++ b/STEER/AOD/CMakeLists.txt @@ -20,7 +20,7 @@ set (MODULE AOD) include_directories(${AliRoot_SOURCE_DIR}/STEER/${MODULE}) # Additional include directories - alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/STEER/ESD ${AliRoot_SOURCE_DIR}/STEER/STEERBase ) diff --git a/STEER/CDB/CMakeLists.txt b/STEER/CDB/CMakeLists.txt index 41514a59bcb..12fde0760dd 100644 --- a/STEER/CDB/CMakeLists.txt +++ b/STEER/CDB/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE CDB) include_directories(${AliRoot_SOURCE_DIR}/STEER/${MODULE}) # Additional include directories -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/STEER/STEERBase ${CMAKE_BINARY_DIR}/version/ ) diff --git a/STEER/ESD/CMakeLists.txt b/STEER/ESD/CMakeLists.txt index e9f9327d50b..6400af3bb32 100644 --- a/STEER/ESD/CMakeLists.txt +++ b/STEER/ESD/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE ESD) include_directories(${AliRoot_SOURCE_DIR}/STEER/${MODULE}) # Additional include directories - alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/STEER/STEERBase) # Sources - alphabetical order diff --git a/STEER/STEER/CMakeLists.txt b/STEER/STEER/CMakeLists.txt index cf9ac131381..7aa614076f2 100644 --- a/STEER/STEER/CMakeLists.txt +++ b/STEER/STEER/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE STEER) include_directories(${AliRoot_SOURCE_DIR}/STEER/${MODULE}) # Additional include directories - alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS ${AliRoot_SOURCE_DIR}/HLT/BASE ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase diff --git a/STEER/STEERBase/CMakeLists.txt b/STEER/STEERBase/CMakeLists.txt index 2cab8ac725d..d10a8227d5a 100644 --- a/STEER/STEERBase/CMakeLists.txt +++ b/STEER/STEERBase/CMakeLists.txt @@ -20,7 +20,7 @@ set (MODULE STEERBase) include_directories(${AliRoot_SOURCE_DIR}/STEER/${MODULE}) # Additional includes - alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_BINARY_DIR}/version ) diff --git a/STRUCT/CMakeLists.txt b/STRUCT/CMakeLists.txt index 0e5e4a81d66..aa37435e981 100644 --- a/STRUCT/CMakeLists.txt +++ b/STRUCT/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE STRUCT) include_directories(${AliRoot_SOURCE_DIR}/${MODULE}) # Additional include directories in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/STEER/STEER ${AliRoot_SOURCE_DIR}/STEER/STEERBase ) diff --git a/T0/T0base/CMakeLists.txt b/T0/T0base/CMakeLists.txt index d8da41af03f..259ac39ad13 100644 --- a/T0/T0base/CMakeLists.txt +++ b/T0/T0base/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE T0base) include_directories(${AliRoot_SOURCE_DIR}/T0/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/RAW/RAWDatasim diff --git a/T0/T0calib/CMakeLists.txt b/T0/T0calib/CMakeLists.txt index 3816272145e..946c425ca04 100644 --- a/T0/T0calib/CMakeLists.txt +++ b/T0/T0calib/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE T0calib) include_directories(${AliRoot_SOURCE_DIR}/T0/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice ${AliRoot_SOURCE_DIR}/STEER/CDB diff --git a/T0/T0rec/CMakeLists.txt b/T0/T0rec/CMakeLists.txt index b3fa30985e0..8cfaa79cd92 100644 --- a/T0/T0rec/CMakeLists.txt +++ b/T0/T0rec/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE T0rec) include_directories(${AliRoot_SOURCE_DIR}/T0/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/STEER/CDB @@ -73,4 +73,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/T0/T0shuttle/CMakeLists.txt b/T0/T0shuttle/CMakeLists.txt index ad792ea4c03..2c79c5c1bd6 100644 --- a/T0/T0shuttle/CMakeLists.txt +++ b/T0/T0shuttle/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE T0shuttle) include_directories(${AliRoot_SOURCE_DIR}/T0/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/STEER/CDB ${AliRoot_SOURCE_DIR}/STEER/STEERBase ${AliRoot_SOURCE_DIR}/T0/T0base @@ -66,4 +66,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/T0/T0sim/CMakeLists.txt b/T0/T0sim/CMakeLists.txt index 65c86cfc575..e40f28d6f6c 100644 --- a/T0/T0sim/CMakeLists.txt +++ b/T0/T0sim/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE T0sim) include_directories(${AliRoot_SOURCE_DIR}/T0/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/STEER/CDB @@ -70,4 +70,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/TAmpt/AMPT/CMakeLists.txt b/TAmpt/AMPT/CMakeLists.txt index 49838f5c065..e5ccf7a65f5 100644 --- a/TAmpt/AMPT/CMakeLists.txt +++ b/TAmpt/AMPT/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE AMPT) include_directories(${AliRoot_SOURCE_DIR}/TAmpt/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ) # Sources in alphabetical order diff --git a/TAmpt/TAmpt/CMakeLists.txt b/TAmpt/TAmpt/CMakeLists.txt index 241960c7a6c..ed638d47f95 100644 --- a/TAmpt/TAmpt/CMakeLists.txt +++ b/TAmpt/TAmpt/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TAmpt) include_directories(${AliRoot_SOURCE_DIR}/TAmpt/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/EVGEN ${AliRoot_SOURCE_DIR}/STEER/STEER ${AliRoot_SOURCE_DIR}/STEER/STEERBase @@ -66,4 +66,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/TDPMjet/CMakeLists.txt b/TDPMjet/CMakeLists.txt index 41c3c261291..a25f37453fc 100644 --- a/TDPMjet/CMakeLists.txt +++ b/TDPMjet/CMakeLists.txt @@ -20,7 +20,7 @@ set (MODULE TDPMjet) include_directories(${AliRoot_SOURCE_DIR}/${MODULE}) # Additional includes - alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/DPMJET ${AliRoot_SOURCE_DIR}/EVGEN ${AliRoot_SOURCE_DIR}/STEER/STEER diff --git a/TEPEMGEN/CMakeLists.txt b/TEPEMGEN/CMakeLists.txt index 1f3385c35ca..40e0eac6887 100644 --- a/TEPEMGEN/CMakeLists.txt +++ b/TEPEMGEN/CMakeLists.txt @@ -21,7 +21,7 @@ include_directories(${AliRoot_SOURCE_DIR}/${MODULE} ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/EVGEN ${AliRoot_SOURCE_DIR}/STEER/STEER ${AliRoot_SOURCE_DIR}/STEER/STEERBase diff --git a/TEvtGen/EvtGen/CMakeLists.txt b/TEvtGen/EvtGen/CMakeLists.txt index f0c034ba57d..c3b1d2c8c3a 100644 --- a/TEvtGen/EvtGen/CMakeLists.txt +++ b/TEvtGen/EvtGen/CMakeLists.txt @@ -20,7 +20,7 @@ set (MODULE EvtGen) include_directories(${AliRoot_SOURCE_DIR}/TEvtGen/${MODULE}) # Additional includes - alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/TEvtGen ) diff --git a/TEvtGen/EvtGenExternal/CMakeLists.txt b/TEvtGen/EvtGenExternal/CMakeLists.txt index 7cba7909cce..1c207c32774 100644 --- a/TEvtGen/EvtGenExternal/CMakeLists.txt +++ b/TEvtGen/EvtGenExternal/CMakeLists.txt @@ -20,7 +20,7 @@ set (MODULE EvtGenExternal) include_directories(${AliRoot_SOURCE_DIR}/TEvtGen/${MODULE}) # Additional includes - alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/PYTHIA8 ${AliRoot_SOURCE_DIR}/TEvtGen ${AliRoot_SOURCE_DIR}/TEvtGen/EvtGen diff --git a/TEvtGen/HepMC/CMakeLists.txt b/TEvtGen/HepMC/CMakeLists.txt index 1388a0fb58d..a1cdfadbe57 100644 --- a/TEvtGen/HepMC/CMakeLists.txt +++ b/TEvtGen/HepMC/CMakeLists.txt @@ -20,7 +20,7 @@ set (MODULE HepMC ) include_directories(${AliRoot_SOURCE_DIR}/TEvtGen/${MODULE}) # Additional includes - alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/TEvtGen ${AliRoot_SOURCE_DIR}/TEvtGen/EvtGen/EvtGenModels ) diff --git a/TEvtGen/Photos/CMakeLists.txt b/TEvtGen/Photos/CMakeLists.txt index ad43d0fd8f3..cac0a3ba7fb 100644 --- a/TEvtGen/Photos/CMakeLists.txt +++ b/TEvtGen/Photos/CMakeLists.txt @@ -20,7 +20,7 @@ set (MODULE Photos) include_directories(${AliRoot_SOURCE_DIR}/TEvtGen/${MODULE}) # Additional includes - alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/TEvtGen ${AliRoot_SOURCE_DIR}/TEvtGen/Photos/src/photosCInterfaces ${AliRoot_SOURCE_DIR}/TEvtGen/Photos/src/utilities diff --git a/TEvtGen/TEvtGen/CMakeLists.txt b/TEvtGen/TEvtGen/CMakeLists.txt index d8148ef2957..27b7b2f333c 100644 --- a/TEvtGen/TEvtGen/CMakeLists.txt +++ b/TEvtGen/TEvtGen/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TEvtGen) include_directories(${AliRoot_SOURCE_DIR}/TEvtGen/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/EVGEN ${AliRoot_SOURCE_DIR}/STEER/STEER ${AliRoot_SOURCE_DIR}/STEER/STEERBase @@ -67,4 +67,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/TEvtGen/THepMCParser/CMakeLists.txt b/TEvtGen/THepMCParser/CMakeLists.txt index 8913172a89f..fcbc494b8d6 100644 --- a/TEvtGen/THepMCParser/CMakeLists.txt +++ b/TEvtGen/THepMCParser/CMakeLists.txt @@ -22,7 +22,7 @@ include_directories(${AliRoot_SOURCE_DIR}/TEvtGen/${MODULE} ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ) # Sources diff --git a/TEvtGen/Tauola/CMakeLists.txt b/TEvtGen/Tauola/CMakeLists.txt index 600c51919e1..1641f872fbb 100644 --- a/TEvtGen/Tauola/CMakeLists.txt +++ b/TEvtGen/Tauola/CMakeLists.txt @@ -20,7 +20,7 @@ set (MODULE Tauola) include_directories(${AliRoot_SOURCE_DIR}/TEvtGen/${MODULE}) # Additional includes - alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/TEvtGen ) diff --git a/THbtp/CMakeLists.txt b/THbtp/CMakeLists.txt index 69ed0aab7a4..f17333f72d3 100644 --- a/THbtp/CMakeLists.txt +++ b/THbtp/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE THbtp) include_directories(${AliRoot_SOURCE_DIR}/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/EVGEN ${AliRoot_SOURCE_DIR}/STEER/STEER ${AliRoot_SOURCE_DIR}/STEER/STEERBase diff --git a/THerwig/CMakeLists.txt b/THerwig/CMakeLists.txt index c34d5400772..6220418d298 100644 --- a/THerwig/CMakeLists.txt +++ b/THerwig/CMakeLists.txt @@ -21,7 +21,7 @@ include_directories(${AliRoot_SOURCE_DIR}/${MODULE} ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/EVGEN ${AliRoot_SOURCE_DIR}/HERWIG ${AliRoot_SOURCE_DIR}/LHAPDF diff --git a/THijing/CMakeLists.txt b/THijing/CMakeLists.txt index 79c2442dc85..88512354c95 100644 --- a/THijing/CMakeLists.txt +++ b/THijing/CMakeLists.txt @@ -21,7 +21,7 @@ include_directories(${AliRoot_SOURCE_DIR}/${MODULE} ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/HIJING ${AliRoot_SOURCE_DIR}/EVGEN ${AliRoot_SOURCE_DIR}/STEER/STEER diff --git a/THydjet/CMakeLists.txt b/THydjet/CMakeLists.txt index 2deb3eea829..fe78cde136e 100644 --- a/THydjet/CMakeLists.txt +++ b/THydjet/CMakeLists.txt @@ -21,7 +21,7 @@ include_directories(${AliRoot_SOURCE_DIR}/${MODULE} ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/EVGEN ${AliRoot_SOURCE_DIR}/PYTHIA6/pythia6 ${AliRoot_SOURCE_DIR}/STEER/STEER diff --git a/TOF/TOFbase/CMakeLists.txt b/TOF/TOFbase/CMakeLists.txt index 2dd88c8dff3..10785d05eac 100644 --- a/TOF/TOFbase/CMakeLists.txt +++ b/TOF/TOFbase/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TOFbase) include_directories(${AliRoot_SOURCE_DIR}/TOF/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/RAW/RAWDatasim diff --git a/TOF/TOFrec/CMakeLists.txt b/TOF/TOFrec/CMakeLists.txt index 2b04c7991b1..728df252348 100644 --- a/TOF/TOFrec/CMakeLists.txt +++ b/TOF/TOFrec/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TOFrec) include_directories(${AliRoot_SOURCE_DIR}/TOF/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/STEER/CDB @@ -80,4 +80,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/TOF/TOFsim/CMakeLists.txt b/TOF/TOFsim/CMakeLists.txt index 882ff076391..e8cfcec1071 100644 --- a/TOF/TOFsim/CMakeLists.txt +++ b/TOF/TOFsim/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TOFsim) include_directories(${AliRoot_SOURCE_DIR}/TOF/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/RAW/RAWDatasim @@ -80,4 +80,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/TPC/TPCbase/CMakeLists.txt b/TPC/TPCbase/CMakeLists.txt index d1b80332502..8ac368b72e8 100644 --- a/TPC/TPCbase/CMakeLists.txt +++ b/TPC/TPCbase/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TPCbase) include_directories(${AliRoot_SOURCE_DIR}/TPC/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/RAW/dateStream diff --git a/TPC/TPCcalib/CMakeLists.txt b/TPC/TPCcalib/CMakeLists.txt index 63bc4cb1307..e6a6b9222b8 100644 --- a/TPC/TPCcalib/CMakeLists.txt +++ b/TPC/TPCcalib/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TPCcalib) include_directories(${AliRoot_SOURCE_DIR}/TPC/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice ${AliRoot_SOURCE_DIR}/RAW/dateStream diff --git a/TPC/TPCmon/CMakeLists.txt b/TPC/TPCmon/CMakeLists.txt index 1550a1bd460..e6df5dc190d 100644 --- a/TPC/TPCmon/CMakeLists.txt +++ b/TPC/TPCmon/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TPCmon) include_directories(${AliRoot_SOURCE_DIR}/TPC/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/dateStream ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec diff --git a/TPC/TPCrec/CMakeLists.txt b/TPC/TPCrec/CMakeLists.txt index 401a73eaef7..e798c20724b 100644 --- a/TPC/TPCrec/CMakeLists.txt +++ b/TPC/TPCrec/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TPCrec) include_directories(${AliRoot_SOURCE_DIR}/TPC/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase diff --git a/TPC/TPCsim/CMakeLists.txt b/TPC/TPCsim/CMakeLists.txt index 7ba6a7b832e..4d305261418 100644 --- a/TPC/TPCsim/CMakeLists.txt +++ b/TPC/TPCsim/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TPCsim) include_directories(${AliRoot_SOURCE_DIR}/TPC/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/RAW/RAWDatasim diff --git a/TPC/TPCutil/CMakeLists.txt b/TPC/TPCutil/CMakeLists.txt index 3c50da035cc..4ba68521291 100644 --- a/TPC/TPCutil/CMakeLists.txt +++ b/TPC/TPCutil/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TPCutil) include_directories(${AliRoot_SOURCE_DIR}/TPC/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/STEER/CDB diff --git a/TPHIC/CMakeLists.txt b/TPHIC/CMakeLists.txt index f3b9a3bf9e0..774b90371c8 100644 --- a/TPHIC/CMakeLists.txt +++ b/TPHIC/CMakeLists.txt @@ -21,7 +21,7 @@ include_directories(${AliRoot_SOURCE_DIR}/${MODULE} ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/EVGEN ${AliRoot_SOURCE_DIR}/LHAPDF ${AliRoot_SOURCE_DIR}/PYTHIA6/AliPythia6 diff --git a/TRD/TRDbase/CMakeLists.txt b/TRD/TRDbase/CMakeLists.txt index cfd30402825..c108e040c46 100644 --- a/TRD/TRDbase/CMakeLists.txt +++ b/TRD/TRDbase/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TRDbase) include_directories(${AliRoot_SOURCE_DIR}/TRD/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/STEER/CDB diff --git a/TRD/TRDbase/CMakeLists.txt... b/TRD/TRDbase/CMakeLists.txt... index 467588cab35..74e2330bd1e 100644 --- a/TRD/TRDbase/CMakeLists.txt... +++ b/TRD/TRDbase/CMakeLists.txt... @@ -20,7 +20,7 @@ set(MODULE TRDbase) include_directories(${AliRoot_SOURCE_DIR}/TRD/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/STEER/CDB diff --git a/TRD/TRDcalib/CMakeLists.txt b/TRD/TRDcalib/CMakeLists.txt index 5d2c3f1129b..471996c670c 100644 --- a/TRD/TRDcalib/CMakeLists.txt +++ b/TRD/TRDcalib/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TRDcalib) include_directories(${AliRoot_SOURCE_DIR}/TRD/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice ${AliRoot_SOURCE_DIR}/STEER/CDB @@ -70,4 +70,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/TRD/TRDgui/CMakeLists.txt b/TRD/TRDgui/CMakeLists.txt index b3059fa5067..79bb69fe1d4 100644 --- a/TRD/TRDgui/CMakeLists.txt +++ b/TRD/TRDgui/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TRDgui) include_directories(${AliRoot_SOURCE_DIR}/TRD/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/STEER/STEERBase ) @@ -75,4 +75,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/TRD/TRDqaAnalysis/CMakeLists.txt b/TRD/TRDqaAnalysis/CMakeLists.txt index 491dac44f5c..671f9c5f806 100644 --- a/TRD/TRDqaAnalysis/CMakeLists.txt +++ b/TRD/TRDqaAnalysis/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TRDqaAnalysis) include_directories(${AliRoot_SOURCE_DIR}/TRD/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice ${AliRoot_SOURCE_DIR}/STEER/ESD @@ -74,4 +74,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/TRD/TRDrec/CMakeLists.txt b/TRD/TRDrec/CMakeLists.txt index 14203386ab9..75a69bb7c54 100644 --- a/TRD/TRDrec/CMakeLists.txt +++ b/TRD/TRDrec/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TRDrec) include_directories(${AliRoot_SOURCE_DIR}/TRD/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/STAT ${AliRoot_SOURCE_DIR}/STEER/ESD diff --git a/TRD/TRDsim/CMakeLists.txt b/TRD/TRDsim/CMakeLists.txt index 67fff5e1cd9..f67c334cd49 100644 --- a/TRD/TRDsim/CMakeLists.txt +++ b/TRD/TRDsim/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TRDsim) include_directories(${AliRoot_SOURCE_DIR}/TRD/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/STEER/ESD diff --git a/TRIGGER/CMakeLists.txt b/TRIGGER/CMakeLists.txt index 5eef947d68a..96e3ee5a176 100644 --- a/TRIGGER/CMakeLists.txt +++ b/TRIGGER/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE TRIGGERbase) include_directories(${AliRoot_SOURCE_DIR}/TRIGGER) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/ITS/ITSbase ${AliRoot_SOURCE_DIR}/STEER/CDB ${AliRoot_SOURCE_DIR}/STEER/STEERBase diff --git a/TTherminator/CMakeLists.txt b/TTherminator/CMakeLists.txt index e4b85299a94..18b307b2cd6 100644 --- a/TTherminator/CMakeLists.txt +++ b/TTherminator/CMakeLists.txt @@ -22,7 +22,7 @@ include_directories(${AliRoot_SOURCE_DIR}/${MODULE} ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/EVGEN ${AliRoot_SOURCE_DIR}/STEER/STEER ${AliRoot_SOURCE_DIR}/STEER/STEERBase diff --git a/TUHKMgen/CMakeLists.txt b/TUHKMgen/CMakeLists.txt index a226c40fd7d..995f326ce5f 100644 --- a/TUHKMgen/CMakeLists.txt +++ b/TUHKMgen/CMakeLists.txt @@ -22,7 +22,7 @@ include_directories(${AliRoot_SOURCE_DIR}/${MODULE} ) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/EVGEN ${AliRoot_SOURCE_DIR}/STEER/STEER ${AliRoot_SOURCE_DIR}/STEER/STEERBase diff --git a/VZERO/VZERObase/CMakeLists.txt b/VZERO/VZERObase/CMakeLists.txt index 098e2524f1f..a4c3bc87743 100644 --- a/VZERO/VZERObase/CMakeLists.txt +++ b/VZERO/VZERObase/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE VZERObase) include_directories(${AliRoot_SOURCE_DIR}/VZERO/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/dateStream ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec diff --git a/VZERO/VZEROrec/CMakeLists.txt b/VZERO/VZEROrec/CMakeLists.txt index 8545d99e7b6..c733cb8a1d8 100644 --- a/VZERO/VZEROrec/CMakeLists.txt +++ b/VZERO/VZEROrec/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE VZEROrec) include_directories(${AliRoot_SOURCE_DIR}/VZERO/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/STEER/CDB diff --git a/VZERO/VZEROsim/CMakeLists.txt b/VZERO/VZEROsim/CMakeLists.txt index 46e3941698a..d37f4a199cf 100644 --- a/VZERO/VZEROsim/CMakeLists.txt +++ b/VZERO/VZEROsim/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE VZEROsim) include_directories(${AliRoot_SOURCE_DIR}/VZERO/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/STEER/CDB @@ -74,4 +74,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/ZDC/ZDCbase/CMakeLists.txt b/ZDC/ZDCbase/CMakeLists.txt index e9759a95cfb..9f1dd64e505 100644 --- a/ZDC/ZDCbase/CMakeLists.txt +++ b/ZDC/ZDCbase/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE ZDCbase) include_directories(${AliRoot_SOURCE_DIR}/ZDC/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/STEER/CDB diff --git a/ZDC/ZDCrec/CMakeLists.txt b/ZDC/ZDCrec/CMakeLists.txt index a27f66d10ba..84eab3500e6 100644 --- a/ZDC/ZDCrec/CMakeLists.txt +++ b/ZDC/ZDCrec/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE ZDCrec) include_directories(${AliRoot_SOURCE_DIR}/ZDC/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/STEER/CDB @@ -86,4 +86,4 @@ install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -install(FILES ${HDRS} DESTINATION include) \ No newline at end of file +install(FILES ${HDRS} DESTINATION include) diff --git a/ZDC/ZDCsim/CMakeLists.txt b/ZDC/ZDCsim/CMakeLists.txt index 2f470bb925e..5f1a1b30167 100644 --- a/ZDC/ZDCsim/CMakeLists.txt +++ b/ZDC/ZDCsim/CMakeLists.txt @@ -20,7 +20,7 @@ set(MODULE ZDCsim) include_directories(${AliRoot_SOURCE_DIR}/ZDC/${MODULE}) # Additional include folders in alphabetical order except ROOT -include_directories(${ROOT_INCLUDE_DIRS} +include_directories(${ROOT_INCLUDE_DIR} ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec ${AliRoot_SOURCE_DIR}/STEER/CDB diff --git a/cmake/FindROOT.cmake b/cmake/FindROOT.cmake index 118dfd562b2..2d3121aa04a 100644 --- a/cmake/FindROOT.cmake +++ b/cmake/FindROOT.cmake @@ -254,7 +254,7 @@ if(ROOTSYS) # adding the libraries and the inc dir link_directories(${ROOT_LIBDIR}) - include_directories(SYSTEM ${ROOT_INCLUDE_DIR}) +# include_directories(SYSTEM ${ROOT_INCLUDE_DIR}) set(ROOT_FOUND TRUE) # Workaround misssing XML, VMC, Minuit from ROOT static library