From 68aeb13b0ab4b3155ffb02549727479227a8261a Mon Sep 17 00:00:00 2001 From: agrigora Date: Thu, 27 Nov 2014 17:37:55 +0100 Subject: [PATCH] Fixes for object target dependencies --- ACORDE/ACORDEbase/CMakeLists.txt | 18 ++++-- ACORDE/ACORDErec/CMakeLists.txt | 2 +- ACORDE/ACORDEsim/CMakeLists.txt | 2 +- ACORDE/DA/CMakeLists.txt | 2 +- AD/ADbase/CMakeLists.txt | 2 +- AD/ADrec/CMakeLists.txt | 2 +- AD/ADsim/CMakeLists.txt | 2 +- ANALYSIS/ANALYSIS/CMakeLists.txt | 18 ++++-- ANALYSIS/ANALYSISalice/CMakeLists.txt | 2 +- ANALYSIS/ANALYSIScalib/CMakeLists.txt | 2 +- ANALYSIS/ESDfilter/CMakeLists.txt | 2 +- ANALYSIS/EventMixing/CMakeLists.txt | 2 +- ANALYSIS/Tender/CMakeLists.txt | 2 +- ANALYSIS/TenderSupplies/CMakeLists.txt | 2 +- BCM/CMakeLists.txt | 2 +- CORRFW/CMakeLists.txt | 2 +- DIME/TDime/CMakeLists.txt | 2 +- DPMJET/CMakeLists.txt | 2 +- EMCAL/DA/CMakeLists.txt | 2 +- EMCAL/EMCALUtils/CMakeLists.txt | 19 ++++-- EMCAL/EMCALbase/CMakeLists.txt | 19 ++++-- EMCAL/EMCALraw/CMakeLists.txt | 19 ++++-- EMCAL/EMCALrec/CMakeLists.txt | 2 +- EMCAL/EMCALsim/CMakeLists.txt | 2 +- EPOS/epos167/CMakeLists.txt | 2 +- EVE/EveBase/CMakeLists.txt | 2 +- EVE/EveDet/CMakeLists.txt | 2 +- EVE/EveHLT/CMakeLists.txt | 2 +- EVGEN/CMakeLists.txt | 2 +- FASTSIM/CMakeLists.txt | 2 +- FIT/FITbase/CMakeLists.txt | 2 +- FIT/FITrec/CMakeLists.txt | 2 +- FIT/FITsim/CMakeLists.txt | 2 +- FMD/DA/CMakeLists.txt | 2 +- FMD/FMDbase/CMakeLists.txt | 14 ++++- FMD/FMDrec/CMakeLists.txt | 14 ++++- FMD/FMDsim/CMakeLists.txt | 14 ++++- FMD/FMDutil/CMakeLists.txt | 14 ++++- HERWIG/CMakeLists.txt | 2 +- HIJING/CMakeLists.txt | 2 +- HLT/BASE/CMakeLists.txt | 2 +- HLT/BASE/interface/CMakeLists.txt | 2 +- HLT/BASE/util/CMakeLists.txt | 2 +- HLT/CALO/CMakeLists.txt | 2 +- HLT/EMCAL/CMakeLists.txt | 2 +- HLT/EVE/CMakeLists.txt | 2 +- HLT/FMD/CMakeLists.txt | 2 +- HLT/ITS/CMakeLists.txt | 2 +- HLT/JET/CMakeLists.txt | 2 +- HLT/MUON/CMakeLists.txt | 2 +- HLT/PHOS/CMakeLists.txt | 2 +- HLT/QA/CMakeLists.txt | 2 +- HLT/RCU/CMakeLists.txt | 2 +- HLT/SampleLib/CMakeLists.txt | 2 +- HLT/TPCLib/CMakeLists.txt | 2 +- HLT/TPCLib/EVE/CMakeLists.txt | 2 +- HLT/TPCLib/calibration/CMakeLists.txt | 2 +- .../tracking-ca/cagpu/cuda/CMakeLists.txt | 2 +- .../tracking-ca/cagpu/opencl/CMakeLists.txt | 2 +- HLT/TRD/CMakeLists.txt | 2 +- HLT/VZERO/CMakeLists.txt | 2 +- HLT/ZDC/CMakeLists.txt | 2 +- HLT/comp/CMakeLists.txt | 2 +- HLT/global/CMakeLists.txt | 2 +- HLT/pendolino/CMakeLists.txt | 2 +- HLT/rec/CMakeLists.txt | 2 +- HLT/shuttle/CMakeLists.txt | 2 +- HLT/sim/CMakeLists.txt | 2 +- HLT/trigger/CMakeLists.txt | 2 +- HMPID/DA/CMakeLists.txt | 2 +- HMPID/HMPIDbase/CMakeLists.txt | 15 ++++- HMPID/HMPIDrec/CMakeLists.txt | 2 +- HMPID/HMPIDsim/CMakeLists.txt | 2 +- ITS/DA/CMakeLists.txt | 2 +- ITS/ITSbase/CMakeLists.txt | 13 ++-- ITS/ITSrec/CMakeLists.txt | 16 +++-- ITS/ITSsim/CMakeLists.txt | 17 ++++-- ITS/UPGRADE/ITSUpgradeBase/CMakeLists.txt | 2 +- ITS/UPGRADE/ITSUpgradeRec/CMakeLists.txt | 2 +- ITS/UPGRADE/ITSUpgradeSim/CMakeLists.txt | 2 +- JETAN/FASTJETAN/CMakeLists.txt | 2 +- JETAN/JETAN/CMakeLists.txt | 2 +- LHAPDF/lhapdf-5.9.1/CMakeLists.txt | 2 +- LHAPDF/lhapdf5.5.1/CMakeLists.txt | 2 +- MFT/MFTbase/CMakeLists.txt | 2 +- MFT/MFTrec/CMakeLists.txt | 2 +- MFT/MFTsim/CMakeLists.txt | 2 +- MICROCERN/CMakeLists.txt | 2 +- MONITOR/MONITOR/CMakeLists.txt | 2 +- MONITOR/MONITORzmq/CMakeLists.txt | 2 +- MONITOR/alionlinereco/CMakeLists.txt | 2 +- MONITOR/alitestproc/CMakeLists.txt | 2 +- MONITOR/monitorCheck/CMakeLists.txt | 2 +- MONITOR/monitorGDC/CMakeLists.txt | 2 +- MUON/DA/CMakeLists.txt | 2 +- MUON/MUONbase/CMakeLists.txt | 10 +++- MUON/MUONcalib/CMakeLists.txt | 10 +++- MUON/MUONcalign/CMakeLists.txt | 2 +- MUON/MUONcore/CMakeLists.txt | 10 +++- MUON/MUONevaluation/CMakeLists.txt | 2 +- MUON/MUONgeometry/CMakeLists.txt | 10 +++- MUON/MUONgraphics/CMakeLists.txt | 2 +- MUON/MUONmapping/CMakeLists.txt | 10 +++- MUON/MUONmpgraphics/CMakeLists.txt | 2 +- MUON/MUONraw/CMakeLists.txt | 10 +++- MUON/MUONrec/CMakeLists.txt | 2 +- MUON/MUONshuttle/CMakeLists.txt | 10 +++- MUON/MUONsim/CMakeLists.txt | 12 +++- MUON/MUONtrigger/CMakeLists.txt | 10 +++- OADB/CMakeLists.txt | 2 +- PHOS/DA/CMakeLists.txt | 2 +- PHOS/PHOSUtils/CMakeLists.txt | 10 +++- PHOS/PHOSbase/CMakeLists.txt | 10 +++- PHOS/PHOSpi0Calib/CMakeLists.txt | 2 +- PHOS/PHOSrec/CMakeLists.txt | 10 +++- PHOS/PHOSshuttle/CMakeLists.txt | 10 +++- PHOS/PHOSsim/CMakeLists.txt | 10 +++- PMD/DA/CMakeLists.txt | 2 +- PMD/PMDbase/CMakeLists.txt | 10 +++- PMD/PMDrec/CMakeLists.txt | 10 +++- PMD/PMDsim/CMakeLists.txt | 2 +- PYTHIA6/AliPythia6/CMakeLists.txt | 2 +- PYTHIA6/QPYTHIA/CMakeLists.txt | 2 +- PYTHIA6/pythia6.4.21/CMakeLists.txt | 2 +- PYTHIA6/pythia6.4.25/CMakeLists.txt | 2 +- PYTHIA6/pythia6/CMakeLists.txt | 2 +- PYTHIA8/AliPythia8/CMakeLists.txt | 2 +- PYTHIA8/pythia8175/CMakeLists.txt | 2 +- RAW/MDC/CMakeLists.txt | 7 ++- RAW/RAWDatabase/CMakeLists.txt | 6 +- RAW/RAWDatarec/CMakeLists.txt | 6 +- RAW/RAWDatarecOnline/CMakeLists.txt | 6 +- RAW/RAWDatasim/CMakeLists.txt | 6 +- RAW/alimdc/CMakeLists.txt | 2 +- RAW/dateStream/CMakeLists.txt | 2 +- SHUTTLE/CMakeLists.txt | 2 +- STARLIGHT/AliStarLight/CMakeLists.txt | 2 +- STARLIGHT/starlight/CMakeLists.txt | 2 +- STAT/CMakeLists.txt | 2 +- STEER/AOD/CMakeLists.txt | 6 +- STEER/CDB/CMakeLists.txt | 6 +- STEER/ESD/CMakeLists.txt | 8 ++- STEER/STEER/CMakeLists.txt | 11 ++-- STRUCT/CMakeLists.txt | 2 +- T0/DA/CMakeLists.txt | 2 +- T0/T0base/CMakeLists.txt | 10 +++- T0/T0calib/CMakeLists.txt | 2 +- T0/T0rec/CMakeLists.txt | 2 +- T0/T0shuttle/CMakeLists.txt | 2 +- T0/T0sim/CMakeLists.txt | 2 +- TAmpt/TAmpt/CMakeLists.txt | 2 +- TDPMjet/CMakeLists.txt | 2 +- TEPEMGEN/CMakeLists.txt | 2 +- TEvtGen/EvtGen/CMakeLists.txt | 2 +- TEvtGen/EvtGenExternal/CMakeLists.txt | 2 +- TEvtGen/HepMC/CMakeLists.txt | 2 +- TEvtGen/Photos/CMakeLists.txt | 2 +- TEvtGen/TEvtGen/CMakeLists.txt | 2 +- TEvtGen/THepMCParser/CMakeLists.txt | 2 +- TEvtGen/Tauola/CMakeLists.txt | 4 +- THbtp/CMakeLists.txt | 2 +- THerwig/CMakeLists.txt | 2 +- THijing/CMakeLists.txt | 2 +- THydjet/CMakeLists.txt | 2 +- TOF/DA/CMakeLists.txt | 2 +- TOF/TOFbase/CMakeLists.txt | 6 +- TOF/TOFcalib/CMakeLists.txt | 2 +- TOF/TOFrec/CMakeLists.txt | 2 +- TOF/TOFsim/CMakeLists.txt | 2 +- TPC/DA/CMakeLists.txt | 2 +- TPC/TPCbase/CMakeLists.txt | 6 +- TPC/TPCcalib/CMakeLists.txt | 2 +- TPC/TPCmon/CMakeLists.txt | 2 +- TPC/TPCrec/CMakeLists.txt | 2 +- TPC/TPCsim/CMakeLists.txt | 6 +- TPC/TPCupgrade/CMakeLists.txt | 2 +- TPC/TPCutil/CMakeLists.txt | 2 +- TPHIC/CMakeLists.txt | 2 +- TRD/DA/CMakeLists.txt | 2 +- TRD/TRDbase/CMakeLists.txt... | 2 +- TRD/TRDcalib/CMakeLists.txt | 2 +- TRD/TRDgui/CMakeLists.txt | 2 +- TRD/TRDqaAnalysis/CMakeLists.txt | 2 +- TRD/TRDrec/CMakeLists.txt | 12 ++-- TRD/TRDsim/CMakeLists.txt | 2 +- TRIGGER/CMakeLists.txt | 2 +- TTherminator/CMakeLists.txt | 2 +- TUHKMgen/CMakeLists.txt | 2 +- VZERO/DA/CMakeLists.txt | 2 +- VZERO/VZERObase/CMakeLists.txt | 4 ++ VZERO/VZEROrec/CMakeLists.txt | 4 ++ VZERO/VZEROsim/CMakeLists.txt | 2 +- ZDC/CMakeLists.txt | 4 ++ ZDC/ZDCbase/CMakeLists.txt | 60 +++++++++++++------ ZDC/ZDCrec/CMakeLists.txt | 2 +- ZDC/ZDCsim/CMakeLists.txt | 2 +- 196 files changed, 584 insertions(+), 262 deletions(-) diff --git a/ACORDE/ACORDEbase/CMakeLists.txt b/ACORDE/ACORDEbase/CMakeLists.txt index 1144617f3c3..d7f2dc71f41 100644 --- a/ACORDE/ACORDEbase/CMakeLists.txt +++ b/ACORDE/ACORDEbase/CMakeLists.txt @@ -65,14 +65,18 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} # Create an object to be reused in case of static libraries # Otherwise the sources will be compiled twice add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) -# Follow headers dependencies -add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object -add_library(${MODULE} SHARED $) +add_library(${MODULE} SHARED $) + +# linking target target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags for the object -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-fPIC -O -g") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -88,12 +92,16 @@ install(FILES ${HDRS} DESTINATION include) # Static version if DA enabled if(ALIROOT_STATIC) - add_library(${MODULE}-static STATIC $) + add_library(${MODULE}-static STATIC $) set_target_properties(${MODULE}-static PROPERTIES OUTPUT_NAME ${MODULE}) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/ACORDE/ACORDErec/CMakeLists.txt b/ACORDE/ACORDErec/CMakeLists.txt index 0d71f926a2f..71ec478fe4b 100644 --- a/ACORDE/ACORDErec/CMakeLists.txt +++ b/ACORDE/ACORDErec/CMakeLists.txt @@ -55,7 +55,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/ACORDE/ACORDEsim/CMakeLists.txt b/ACORDE/ACORDEsim/CMakeLists.txt index 567a885515e..b27c36461d4 100644 --- a/ACORDE/ACORDEsim/CMakeLists.txt +++ b/ACORDE/ACORDEsim/CMakeLists.txt @@ -60,7 +60,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/ACORDE/DA/CMakeLists.txt b/ACORDE/DA/CMakeLists.txt index 578cc73f3dc..e7f725e18e2 100644 --- a/ACORDE/DA/CMakeLists.txt +++ b/ACORDE/DA/CMakeLists.txt @@ -50,7 +50,7 @@ set(MODULE_LINK_FLAGS) target_link_libraries(ACORDEda ESD-static RAWDatabase-static RAWDatarec-static ACORDEbase-static ${AMORE_AUXLIBS} daqDA ${DATE_MONLIBRARIES} ${DATE_RCPROXYLIBRARIES} Root RootExtra) # different flags -set(MODULE_COMPILE_FLAGS "-O -g ${DATE_CFLAGS} ${AMORE_CFLAGS}") +set(MODULE_COMPILE_FLAGS " ${DATE_CFLAGS} ${AMORE_CFLAGS}") set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${AMORE_STATICLIBS}") # DATE flags diff --git a/AD/ADbase/CMakeLists.txt b/AD/ADbase/CMakeLists.txt index 0cda5ea73a3..a167873b480 100644 --- a/AD/ADbase/CMakeLists.txt +++ b/AD/ADbase/CMakeLists.txt @@ -55,7 +55,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/AD/ADrec/CMakeLists.txt b/AD/ADrec/CMakeLists.txt index 678c16a84d4..d668a7893d4 100644 --- a/AD/ADrec/CMakeLists.txt +++ b/AD/ADrec/CMakeLists.txt @@ -56,7 +56,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/AD/ADsim/CMakeLists.txt b/AD/ADsim/CMakeLists.txt index 811332b71d7..7ddc35ba013 100644 --- a/AD/ADsim/CMakeLists.txt +++ b/AD/ADsim/CMakeLists.txt @@ -57,7 +57,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/ANALYSIS/ANALYSIS/CMakeLists.txt b/ANALYSIS/ANALYSIS/CMakeLists.txt index c53a808cbfe..27c4fd08b33 100644 --- a/ANALYSIS/ANALYSIS/CMakeLists.txt +++ b/ANALYSIS/ANALYSIS/CMakeLists.txt @@ -55,13 +55,16 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} # Create an object to be reused in case of static libraries # Otherwise the sources will be compiled twice add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) -add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object -add_library(${MODULE} SHARED $) +add_library(${MODULE} SHARED $) # linking target_link_libraries(${MODULE} ${ROOT_DEPENDENCIE} ${ALIROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "") @@ -79,9 +82,16 @@ install(FILES ${HDRS} DESTINATION include) # Static version if DA enabled if(ALIROOT_STATIC) - add_library(${MODULE}-static STATIC $) + add_library(${MODULE}-static STATIC $) set_target_properties(${MODULE}-static PROPERTIES OUTPUT_NAME ${MODULE}) - target_link_libraries(${MODULE}-static STEERBase-static Root) + + # list of shared dependencies / the name of the variable containing the list of static ones + generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") + target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root RootExtra) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/ANALYSIS/ANALYSISalice/CMakeLists.txt b/ANALYSIS/ANALYSISalice/CMakeLists.txt index 798c5773edc..2918bb54416 100644 --- a/ANALYSIS/ANALYSISalice/CMakeLists.txt +++ b/ANALYSIS/ANALYSISalice/CMakeLists.txt @@ -110,7 +110,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase OADB AOD ESD ANALYSIS Core EG Gpad Gui Hist MathCore Matrix Net Physics RIO TreePlayer Tree XMLIO) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/ANALYSIS/ANALYSIScalib/CMakeLists.txt b/ANALYSIS/ANALYSIScalib/CMakeLists.txt index 78aa3eb5228..fc81dfa10af 100644 --- a/ANALYSIS/ANALYSIScalib/CMakeLists.txt +++ b/ANALYSIS/ANALYSIScalib/CMakeLists.txt @@ -54,7 +54,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} ANALYSIS ESD STEERBase Core Hist MathCore Net RIO Tree) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/ANALYSIS/ESDfilter/CMakeLists.txt b/ANALYSIS/ESDfilter/CMakeLists.txt index c9ebdfd41c9..76a61b9b141 100644 --- a/ANALYSIS/ESDfilter/CMakeLists.txt +++ b/ANALYSIS/ESDfilter/CMakeLists.txt @@ -53,7 +53,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} ANALYSIS ANALYSISalice OADB AOD ESD STEERBase EMCALUtils Core EG Hist MathCore Physics RIO Tree) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/ANALYSIS/EventMixing/CMakeLists.txt b/ANALYSIS/EventMixing/CMakeLists.txt index 219146d132f..2914e0f2495 100644 --- a/ANALYSIS/EventMixing/CMakeLists.txt +++ b/ANALYSIS/EventMixing/CMakeLists.txt @@ -56,7 +56,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} ANALYSIS ANALYSISalice AOD ESD STEERBase Core Gpad Hist RIO Tree) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/ANALYSIS/Tender/CMakeLists.txt b/ANALYSIS/Tender/CMakeLists.txt index 2982e3fc71f..e54c5068cf3 100644 --- a/ANALYSIS/Tender/CMakeLists.txt +++ b/ANALYSIS/Tender/CMakeLists.txt @@ -52,7 +52,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} ANALYSIS ANALYSISalice CDB ESD STEERBase Core RIO) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/ANALYSIS/TenderSupplies/CMakeLists.txt b/ANALYSIS/TenderSupplies/CMakeLists.txt index 9a8f75d1c25..59478b3cbd1 100644 --- a/ANALYSIS/TenderSupplies/CMakeLists.txt +++ b/ANALYSIS/TenderSupplies/CMakeLists.txt @@ -81,7 +81,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} ANALYSIS ANALYSISalice Tender EMCALbase EMCALrec EMCALUtils CORRFW OADB PHOSbase PHOSrec PHOSUtils AOD CDB ESD STEER STEERBase T0rec TOFbase TOFrec TPCbase TRDbase VZERObase VZEROrec Core Geom Gpad Graf Hist MathCore Matrix Physics RIO Tree) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/BCM/CMakeLists.txt b/BCM/CMakeLists.txt index 801f6948889..b4b92550826 100644 --- a/BCM/CMakeLists.txt +++ b/BCM/CMakeLists.txt @@ -49,7 +49,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/CORRFW/CMakeLists.txt b/CORRFW/CMakeLists.txt index 2a7a91e9dab..09a99cd98ca 100644 --- a/CORRFW/CMakeLists.txt +++ b/CORRFW/CMakeLists.txt @@ -71,7 +71,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") if(ROOT_HASALIEN) add_definitions(-DWITHALIEN) diff --git a/DIME/TDime/CMakeLists.txt b/DIME/TDime/CMakeLists.txt index 7c4a0f11355..15a4dfd36e2 100644 --- a/DIME/TDime/CMakeLists.txt +++ b/DIME/TDime/CMakeLists.txt @@ -44,7 +44,7 @@ set(LIBDEPS dime EG) generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h") # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") target_link_libraries(${MODULE}) # System dependent: Modify the way the library is build diff --git a/DPMJET/CMakeLists.txt b/DPMJET/CMakeLists.txt index 6655de2e6b1..75fc2f2cd25 100644 --- a/DPMJET/CMakeLists.txt +++ b/DPMJET/CMakeLists.txt @@ -60,7 +60,7 @@ else(FLUPRO) endif(FLUPRO) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/EMCAL/DA/CMakeLists.txt b/EMCAL/DA/CMakeLists.txt index 100f5448b64..a44baff6a8d 100644 --- a/EMCAL/DA/CMakeLists.txt +++ b/EMCAL/DA/CMakeLists.txt @@ -47,7 +47,7 @@ target_link_libraries(EMCALPEDda EMCALbase-static RAWDatarec-static RAWDatabase- target_link_libraries(EMCALLEDda EMCALbase-static RAWDatarec-static RAWDatabase-static STEERBase-static ${AMORE_AUXLIBS} daqDA ${DATE_MONLIBRARIES} ${DATE_RCPROXYLIBRARIES} Root RootExtra) # different flags -set(MODULE_COMPILE_FLAGS "-O -g ${DATE_CFLAGS} ${AMORE_CFLAGS}") +set(MODULE_COMPILE_FLAGS " ${DATE_CFLAGS} ${AMORE_CFLAGS}") set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${AMORE_STATICLIBS}") # DATE flags diff --git a/EMCAL/EMCALUtils/CMakeLists.txt b/EMCAL/EMCALUtils/CMakeLists.txt index 5c2bbf4ca1b..4696aa75bf2 100644 --- a/EMCAL/EMCALUtils/CMakeLists.txt +++ b/EMCAL/EMCALUtils/CMakeLists.txt @@ -62,11 +62,15 @@ add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) # Follow headers dependencies add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object -add_library(${MODULE} SHARED $) +add_library(${MODULE} SHARED $) target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") add_definitions(-D__EMCALUTIL__) # System dependent: Modify the way the library is build @@ -83,9 +87,16 @@ install(FILES ${HDRS} DESTINATION include) # Static version if DA enabled if(ALIROOT_STATIC) - add_library(${MODULE}-static STATIC $) + add_library(${MODULE}-static STATIC $) set_target_properties(${MODULE}-static PROPERTIES OUTPUT_NAME ${MODULE}) - target_link_libraries(${MODULE}-static STEERBase-static ESD-static AOD-static Root) + + # list of shared dependencies / the name of the variable containing the list of static ones + generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") + target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root RootExtra) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/EMCAL/EMCALbase/CMakeLists.txt b/EMCAL/EMCALbase/CMakeLists.txt index 82716ddef5b..870182d6612 100644 --- a/EMCAL/EMCALbase/CMakeLists.txt +++ b/EMCAL/EMCALbase/CMakeLists.txt @@ -81,7 +81,7 @@ get_directory_property(incdirs INCLUDE_DIRECTORIES) generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}") set(ROOT_DEPENDENCIES) -set(ALIROOT_DEPENDENCIES STEERBase STEER CDB ESD RAWDatabase RAWDatarec EMCALraw EMCALUtils) +set(ALIROOT_DEPENDENCIES STEERBase STEER CDB ESD RAWDatabase RAWDatarec RAWDatasim EMCALraw EMCALUtils) # Generate the ROOT map # Dependecies @@ -94,11 +94,15 @@ add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) # Build dependencies for object, headers, defines etc add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object -add_library(${MODULE} SHARED $) +add_library(${MODULE} SHARED $) # dependencies target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "") @@ -116,9 +120,16 @@ install(FILES ${HDRS} DESTINATION include) # Static version if DA enabled if(ALIROOT_STATIC) - add_library(${MODULE}-static STATIC $) + add_library(${MODULE}-static STATIC $) set_target_properties(${MODULE}-static PROPERTIES OUTPUT_NAME ${MODULE}) - target_link_libraries(${MODULE}-static STEERBase-static STEER-static ESD-static CDB-static AOD-static RAWDatabase-static RAWDatarec-static RAWDatasim-static EMCALraw-static EMCALUtils-static Root) + + # list of shared dependencies / the name of the variable containing the list of static ones + generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") + target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root RootExtra) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/EMCAL/EMCALraw/CMakeLists.txt b/EMCAL/EMCALraw/CMakeLists.txt index 72d82a0bb8e..763b7d7ce9b 100644 --- a/EMCAL/EMCALraw/CMakeLists.txt +++ b/EMCAL/EMCALraw/CMakeLists.txt @@ -69,14 +69,16 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} # Create an object to be reused in case of static libraries # Otherwise the sources will be compiled twice add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) -# Build dependencies as headers, defines -add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object -add_library(${MODULE} SHARED $) +add_library(${MODULE} SHARED $) # Linking to the dependencies target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "") add_definitions(-D__EMCALUTIL__) @@ -95,9 +97,16 @@ install(FILES ${HDRS} DESTINATION include) # Static version if DA enabled if(ALIROOT_STATIC) - add_library(${MODULE}-static STATIC $) + add_library(${MODULE}-static STATIC $) set_target_properties(${MODULE}-static PROPERTIES OUTPUT_NAME ${MODULE}) - target_link_libraries(${MODULE}-static STEERBase-static ESD-static CDB-static RAWDatabase-static RAWDatarec-static EMCALUtils-static Root) + + # list of shared dependencies / the name of the variable containing the list of static ones + generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") + target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root RootExtra) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/EMCAL/EMCALrec/CMakeLists.txt b/EMCAL/EMCALrec/CMakeLists.txt index a2e63d25242..ba5fa271400 100644 --- a/EMCAL/EMCALrec/CMakeLists.txt +++ b/EMCAL/EMCALrec/CMakeLists.txt @@ -67,7 +67,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") add_definitions(-D__EMCALUTIL__) # System dependent: Modify the way the library is build diff --git a/EMCAL/EMCALsim/CMakeLists.txt b/EMCAL/EMCALsim/CMakeLists.txt index b3d3408c6b8..e90653b1cd7 100644 --- a/EMCAL/EMCALsim/CMakeLists.txt +++ b/EMCAL/EMCALsim/CMakeLists.txt @@ -63,7 +63,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") add_definitions(-D__EMCALUTIL__) # System dependent: Modify the way the library is build diff --git a/EPOS/epos167/CMakeLists.txt b/EPOS/epos167/CMakeLists.txt index cde50dd9e1e..e86417f961c 100644 --- a/EPOS/epos167/CMakeLists.txt +++ b/EPOS/epos167/CMakeLists.txt @@ -85,7 +85,7 @@ target_link_libraries(${MODULE} STEERBase STEER EVGEN Core EG MathCore) # Additional compilation and linking flags set(CMAKE_C_FLAGS "-ansi ${CMAKE_C_FLAGS}") set(CMAKE_Fortran_FLAGS "-cpp") -set(MODULE_COMPILE_FLAGS "-O -g") +set(MODULE_COMPILE_FLAGS "") set(MODULE_LINK_FLAGS) # System dependent: Modify the way the library is build diff --git a/EVE/EveBase/CMakeLists.txt b/EVE/EveBase/CMakeLists.txt index 3bc0438aece..c6fae61e425 100644 --- a/EVE/EveBase/CMakeLists.txt +++ b/EVE/EveBase/CMakeLists.txt @@ -105,7 +105,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER ESD CDB AOD RAWDatabase RAWDatarec ANALYSIS ANALYSISalice ITSbase ITSrec TPCbase TPCrec TPCsim EG Eve Ged Gpad Graf Graf3d Gui Minuit Net RGL Rint) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/EVE/EveDet/CMakeLists.txt b/EVE/EveDet/CMakeLists.txt index 4dd8450edcf..e92d724c4ab 100644 --- a/EVE/EveDet/CMakeLists.txt +++ b/EVE/EveDet/CMakeLists.txt @@ -126,7 +126,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER ESD CDB RAWDatabase RAWDatarec EMCALbase EMCALUtils FMDbase FMDrec FMDsim ITSbase ITSsim ITSUpgradeBase ITSUpgradeSim MUONbase MUONgeometry MUONmapping MUONrec MUONsim PMDbase T0base TOFbase TPCbase TRDbase TRDrec VZERObase VZEROrec EveBase EG Eve Ged GenVector Gpad Gui Minuit RGL STAT MLP) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/EVE/EveHLT/CMakeLists.txt b/EVE/EveHLT/CMakeLists.txt index 6ac90e3179a..57ebf6e86ae 100644 --- a/EVE/EveHLT/CMakeLists.txt +++ b/EVE/EveHLT/CMakeLists.txt @@ -65,7 +65,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase ESD HLTbase AliHLTHOMER AliHLTEve Eve Ged Gui RGL Thread) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/EVGEN/CMakeLists.txt b/EVGEN/CMakeLists.txt index 4a5346bdfec..7567ce9b72c 100644 --- a/EVGEN/CMakeLists.txt +++ b/EVGEN/CMakeLists.txt @@ -113,7 +113,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/FASTSIM/CMakeLists.txt b/FASTSIM/CMakeLists.txt index f677e84b49c..c26217b5b0d 100644 --- a/FASTSIM/CMakeLists.txt +++ b/FASTSIM/CMakeLists.txt @@ -57,7 +57,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/FIT/FITbase/CMakeLists.txt b/FIT/FITbase/CMakeLists.txt index 1588926cd7c..c27c5548b57 100644 --- a/FIT/FITbase/CMakeLists.txt +++ b/FIT/FITbase/CMakeLists.txt @@ -56,7 +56,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER ESD RAWDatabase RAWDatarec RAWDatasim Core Hist MathCore RIO Tree) # Additional compilation flags -set(MODULE_COMPILE_FLAGS "-O -g") +set(MODULE_COMPILE_FLAGS "") set(MODULE_LINK_FLAGS) # System dependent: Modify the way the library is build diff --git a/FIT/FITrec/CMakeLists.txt b/FIT/FITrec/CMakeLists.txt index 767311666b4..9b9f7f61325 100644 --- a/FIT/FITrec/CMakeLists.txt +++ b/FIT/FITrec/CMakeLists.txt @@ -51,7 +51,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER ESD RAWDatabase RAWDatarec FITbase Core) # Additional compilation flags -set(MODULE_COMPILE_FLAGS "-O -g") +set(MODULE_COMPILE_FLAGS "") set(MODULE_LINK_FLAGS) # System dependent: Modify the way the library is build diff --git a/FIT/FITsim/CMakeLists.txt b/FIT/FITsim/CMakeLists.txt index a2c553952c5..cbddd6bb599 100644 --- a/FIT/FITsim/CMakeLists.txt +++ b/FIT/FITsim/CMakeLists.txt @@ -51,7 +51,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER FITbase CDB Core Geom Physics VMC) # Additional compilation flags -set(MODULE_COMPILE_FLAGS "-O -g") +set(MODULE_COMPILE_FLAGS "") set(MODULE_LINK_FLAGS) # System dependent: Modify the way the library is build diff --git a/FMD/DA/CMakeLists.txt b/FMD/DA/CMakeLists.txt index 61a7b4fe74c..2654fe64ecb 100644 --- a/FMD/DA/CMakeLists.txt +++ b/FMD/DA/CMakeLists.txt @@ -52,7 +52,7 @@ target_link_libraries(FMDGainda FMDbase-static FMDutil-static ${AMORE_AUXLIBS} d target_link_libraries(FMDPedestalda FMDbase-static FMDutil-static ${AMORE_AUXLIBS} daqDA ${DATE_MONLIBRARIES} ${DATE_RCPROXYLIBRARIES} Root RootExtra) # different flags -set(MODULE_COMPILE_FLAGS "-O -g ${DATE_CFLAGS} ${AMORE_CFLAGS}") +set(MODULE_COMPILE_FLAGS " ${DATE_CFLAGS} ${AMORE_CFLAGS}") set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${AMORE_STATICLIBS}") set_target_properties(FMDBaseda PROPERTIES COMPILE_FLAGS ${MODULE_COMPILE_FLAGS}) diff --git a/FMD/FMDbase/CMakeLists.txt b/FMD/FMDbase/CMakeLists.txt index 6a868ae6bf2..e3e3629f503 100644 --- a/FMD/FMDbase/CMakeLists.txt +++ b/FMD/FMDbase/CMakeLists.txt @@ -79,13 +79,17 @@ add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) # Follow headers dependencies add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object -add_library(${MODULE} SHARED $) +add_library(${MODULE} SHARED $) # linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -101,12 +105,16 @@ install(FILES ${HDRS} DESTINATION include) # Static version if DA enabled if(ALIROOT_STATIC) - add_library(${MODULE}-static STATIC $) + add_library(${MODULE}-static STATIC $) set_target_properties(${MODULE}-static PROPERTIES OUTPUT_NAME ${MODULE}) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/FMD/FMDrec/CMakeLists.txt b/FMD/FMDrec/CMakeLists.txt index 63dfa2ea9f9..eeb51cd1353 100644 --- a/FMD/FMDrec/CMakeLists.txt +++ b/FMD/FMDrec/CMakeLists.txt @@ -64,13 +64,17 @@ add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) # Follow headers dependencies add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object -add_library(${MODULE} SHARED $) +add_library(${MODULE} SHARED $) # dependecies target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -86,12 +90,16 @@ install(FILES ${HDRS} DESTINATION include) # Static version if DA enabled if(ALIROOT_STATIC) - add_library(${MODULE}-static STATIC $) + add_library(${MODULE}-static STATIC $) set_target_properties(${MODULE}-static PROPERTIES OUTPUT_NAME ${MODULE}) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/FMD/FMDsim/CMakeLists.txt b/FMD/FMDsim/CMakeLists.txt index 523c05c94b9..ef1b4bb2359 100644 --- a/FMD/FMDsim/CMakeLists.txt +++ b/FMD/FMDsim/CMakeLists.txt @@ -68,13 +68,17 @@ add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) # Follow headers dependencies add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object -add_library(${MODULE} SHARED $) +add_library(${MODULE} SHARED $) # linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -90,12 +94,16 @@ install(FILES ${HDRS} DESTINATION include) # Static version if DA enabled if(ALIROOT_STATIC) - add_library(${MODULE}-static STATIC $) + add_library(${MODULE}-static STATIC $) set_target_properties(${MODULE}-static PROPERTIES OUTPUT_NAME ${MODULE}) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/FMD/FMDutil/CMakeLists.txt b/FMD/FMDutil/CMakeLists.txt index d6c92784b6d..1051d6a1d87 100644 --- a/FMD/FMDutil/CMakeLists.txt +++ b/FMD/FMDutil/CMakeLists.txt @@ -70,13 +70,17 @@ add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) # Follow headers dependencies add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object -add_library(${MODULE} SHARED $) +add_library(${MODULE} SHARED $) # dependecies target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -92,13 +96,17 @@ install(FILES ${HDRS} DESTINATION include) # Static version if DA enabled if(ALIROOT_STATIC) - add_library(${MODULE}-static STATIC $) + add_library(${MODULE}-static STATIC $) set_target_properties(${MODULE}-static PROPERTIES OUTPUT_NAME ${MODULE}) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/HERWIG/CMakeLists.txt b/HERWIG/CMakeLists.txt index 3de9480dfc0..93459516927 100644 --- a/HERWIG/CMakeLists.txt +++ b/HERWIG/CMakeLists.txt @@ -48,7 +48,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx ${FSRCS}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HIJING/CMakeLists.txt b/HIJING/CMakeLists.txt index 3227cd15fc5..93e3007a826 100644 --- a/HIJING/CMakeLists.txt +++ b/HIJING/CMakeLists.txt @@ -51,7 +51,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx ${FSRCS}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/BASE/CMakeLists.txt b/HLT/BASE/CMakeLists.txt index 030e446a70e..808ab636ebc 100644 --- a/HLT/BASE/CMakeLists.txt +++ b/HLT/BASE/CMakeLists.txt @@ -144,7 +144,7 @@ add_library(${MODULE} SHARED $) target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-fPIC -O -g") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/BASE/interface/CMakeLists.txt b/HLT/BASE/interface/CMakeLists.txt index 78cf8f39c37..701971b5dca 100644 --- a/HLT/BASE/interface/CMakeLists.txt +++ b/HLT/BASE/interface/CMakeLists.txt @@ -48,7 +48,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") target_link_libraries(${MODULE} HLTbase) # System dependent: Modify the way the library is build diff --git a/HLT/BASE/util/CMakeLists.txt b/HLT/BASE/util/CMakeLists.txt index 10a12cb2bc0..950cbb47262 100644 --- a/HLT/BASE/util/CMakeLists.txt +++ b/HLT/BASE/util/CMakeLists.txt @@ -81,7 +81,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER AOD CDB ESD RAWDatabase RAWDatarec ANALYSISalice HLTbase Graf) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/CALO/CMakeLists.txt b/HLT/CALO/CMakeLists.txt index d2a7e25737b..ceb37088a11 100644 --- a/HLT/CALO/CMakeLists.txt +++ b/HLT/CALO/CMakeLists.txt @@ -93,7 +93,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER CDB RAWDatabase RAWDatarec HLTbase AliHLTTPC EMCALUtils EMCALraw EMCALbase PHOSbase PHOSUtils) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/EMCAL/CMakeLists.txt b/HLT/EMCAL/CMakeLists.txt index 773863be899..3640627719d 100644 --- a/HLT/EMCAL/CMakeLists.txt +++ b/HLT/EMCAL/CMakeLists.txt @@ -69,7 +69,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER CDB HLTbase AliHLTUtil EMCALbase EMCALUtils EMCALraw AliHLTCalo) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/EVE/CMakeLists.txt b/HLT/EVE/CMakeLists.txt index 940f89e2e9d..8d97ab7409d 100644 --- a/HLT/EVE/CMakeLists.txt +++ b/HLT/EVE/CMakeLists.txt @@ -83,7 +83,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER ESD CDB HLTbase AliHLTUtil PHOSbase PHOSUtils EMCALUtils AliHLTTPC AliHLTMUON AliHLTITS AliHLTTRD ITSbase MUONcore MUONbase MUONraw MUONrec TRDrec EveDet) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/FMD/CMakeLists.txt b/HLT/FMD/CMakeLists.txt index 2b238a2273c..fd5e0d39fa9 100644 --- a/HLT/FMD/CMakeLists.txt +++ b/HLT/FMD/CMakeLists.txt @@ -56,7 +56,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER ESD CDB RAWDatabase RAWDatarec HLTbase FMDbase FMDrec) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/ITS/CMakeLists.txt b/HLT/ITS/CMakeLists.txt index f2a44aad8cc..54dbf16dab8 100644 --- a/HLT/ITS/CMakeLists.txt +++ b/HLT/ITS/CMakeLists.txt @@ -87,7 +87,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER ESD CDB RAWDatabase RAWDatarec HLTbase AliHLTUtil ITSbase ITSrec ITSsim) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/JET/CMakeLists.txt b/HLT/JET/CMakeLists.txt index 9b3e7921ce8..fb778eb6455 100644 --- a/HLT/JET/CMakeLists.txt +++ b/HLT/JET/CMakeLists.txt @@ -85,7 +85,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") target_link_libraries(${MODULE} STEERBase AOD ESD ANALYSISalice HLTbase AliHLTUtil JETAN) if(FASTJET_FOUND) diff --git a/HLT/MUON/CMakeLists.txt b/HLT/MUON/CMakeLists.txt index 9c8213ee90b..a1af0e2785f 100644 --- a/HLT/MUON/CMakeLists.txt +++ b/HLT/MUON/CMakeLists.txt @@ -114,7 +114,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER CDB ESD RAWDatabase RAWDatarec RAWDatasim HLTbase MUONraw MUONcore MUONcalib MUONmapping MUONsim MUONevaluation MUONtrigger MUONgeometry MUONrec) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/PHOS/CMakeLists.txt b/HLT/PHOS/CMakeLists.txt index 3e4a42ccb42..4052883df01 100644 --- a/HLT/PHOS/CMakeLists.txt +++ b/HLT/PHOS/CMakeLists.txt @@ -74,7 +74,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEER STEERBase CDB RAWDatabase AliHLTUtil EMCALraw EMCALUtils HLTbase PHOSUtils PHOSbase PHOSrec AliHLTCalo) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/QA/CMakeLists.txt b/HLT/QA/CMakeLists.txt index b4353bd5572..3c3d91f060c 100644 --- a/HLT/QA/CMakeLists.txt +++ b/HLT/QA/CMakeLists.txt @@ -55,7 +55,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEER HLTbase) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/RCU/CMakeLists.txt b/HLT/RCU/CMakeLists.txt index 5ede630ffdc..b6439fdfa7e 100644 --- a/HLT/RCU/CMakeLists.txt +++ b/HLT/RCU/CMakeLists.txt @@ -55,7 +55,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase RAWDatabase RAWDatarec ESD HLTbase) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/SampleLib/CMakeLists.txt b/HLT/SampleLib/CMakeLists.txt index 86d9413c625..7d8b52918c5 100644 --- a/HLT/SampleLib/CMakeLists.txt +++ b/HLT/SampleLib/CMakeLists.txt @@ -60,7 +60,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase CDB ESD RAWDatabase RAWDatarec HLTbase) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/TPCLib/CMakeLists.txt b/HLT/TPCLib/CMakeLists.txt index fefa6281298..49397eeca01 100644 --- a/HLT/TPCLib/CMakeLists.txt +++ b/HLT/TPCLib/CMakeLists.txt @@ -187,7 +187,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} Vc STEERBase STEER ESD CDB RAWDatabase RAWDatarec ANALYSISalice HLTbase AliHLTUtil AliHLTRCU TPCbase TPCrec TPCsim Eve Graf Gpad Recorder) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/TPCLib/EVE/CMakeLists.txt b/HLT/TPCLib/EVE/CMakeLists.txt index 8a7e20a01f0..a50aac6cde2 100644 --- a/HLT/TPCLib/EVE/CMakeLists.txt +++ b/HLT/TPCLib/EVE/CMakeLists.txt @@ -51,7 +51,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} ESD RAWDatabase RAWDatarec HLTbase AliHLTTPC Eve) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/TPCLib/calibration/CMakeLists.txt b/HLT/TPCLib/calibration/CMakeLists.txt index b9ecd0b5ec1..f19efbef602 100644 --- a/HLT/TPCLib/calibration/CMakeLists.txt +++ b/HLT/TPCLib/calibration/CMakeLists.txt @@ -63,7 +63,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER CDB ESD ANALYSIS TPCbase TPCcalib TPCrec HLTbase AliHLTUtil AliHLTTPC) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/TPCLib/tracking-ca/cagpu/cuda/CMakeLists.txt b/HLT/TPCLib/tracking-ca/cagpu/cuda/CMakeLists.txt index aa2d4033abe..14429117a3c 100644 --- a/HLT/TPCLib/tracking-ca/cagpu/cuda/CMakeLists.txt +++ b/HLT/TPCLib/tracking-ca/cagpu/cuda/CMakeLists.txt @@ -89,7 +89,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} ${CUDA_LIBRARIES} cuda) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") *# Installation install(TARGETS ${MODULE} diff --git a/HLT/TPCLib/tracking-ca/cagpu/opencl/CMakeLists.txt b/HLT/TPCLib/tracking-ca/cagpu/opencl/CMakeLists.txt index 96c598d7953..939d630e256 100644 --- a/HLT/TPCLib/tracking-ca/cagpu/opencl/CMakeLists.txt +++ b/HLT/TPCLib/tracking-ca/cagpu/opencl/CMakeLists.txt @@ -112,7 +112,7 @@ link_directories(${AMDAPPSDKROOT}/lib/x86_64) target_link_libraries(amdocl64 OpenCL) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") *# Installation install(TARGETS ${MODULE} diff --git a/HLT/TRD/CMakeLists.txt b/HLT/TRD/CMakeLists.txt index 723ea471934..497d6489a4e 100644 --- a/HLT/TRD/CMakeLists.txt +++ b/HLT/TRD/CMakeLists.txt @@ -79,7 +79,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER ESD CDB RAWDatabase RAWDatarec HLTbase AliHLTUtil TRDbase TRDrec Net STAT MLP) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/VZERO/CMakeLists.txt b/HLT/VZERO/CMakeLists.txt index 887efa1e20c..13eb047abda 100644 --- a/HLT/VZERO/CMakeLists.txt +++ b/HLT/VZERO/CMakeLists.txt @@ -55,7 +55,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER ESD CDB RAWDatabase RAWDatarec HLTbase VZEROrec VZERObase) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/ZDC/CMakeLists.txt b/HLT/ZDC/CMakeLists.txt index c994cfde5de..211b6fdaf48 100644 --- a/HLT/ZDC/CMakeLists.txt +++ b/HLT/ZDC/CMakeLists.txt @@ -55,7 +55,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEER STEERBase ESD CDB RAWDatabase RAWDatarec ZDCrec HLTbase ZDCbase) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/comp/CMakeLists.txt b/HLT/comp/CMakeLists.txt index d0647b12787..effa13a2468 100644 --- a/HLT/comp/CMakeLists.txt +++ b/HLT/comp/CMakeLists.txt @@ -47,7 +47,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} HLTbase) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/global/CMakeLists.txt b/HLT/global/CMakeLists.txt index 256feb025ec..c05658c3e02 100644 --- a/HLT/global/CMakeLists.txt +++ b/HLT/global/CMakeLists.txt @@ -97,7 +97,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER ESD CDB ANALYSISalice AliHLTTPC HLTbase AliHLTUtil AliHLTITS TPCrec ITSbase ITSrec TPCcalib) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/pendolino/CMakeLists.txt b/HLT/pendolino/CMakeLists.txt index 93a7ad2cba2..836cf914d6f 100644 --- a/HLT/pendolino/CMakeLists.txt +++ b/HLT/pendolino/CMakeLists.txt @@ -67,7 +67,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEER CDB TPCbase TPCrec HLTbase) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/rec/CMakeLists.txt b/HLT/rec/CMakeLists.txt index e9de69c9434..410e946d21d 100644 --- a/HLT/rec/CMakeLists.txt +++ b/HLT/rec/CMakeLists.txt @@ -65,7 +65,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEER HLTbase) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/shuttle/CMakeLists.txt b/HLT/shuttle/CMakeLists.txt index 5d97c2d70c6..2b7448cf640 100644 --- a/HLT/shuttle/CMakeLists.txt +++ b/HLT/shuttle/CMakeLists.txt @@ -51,7 +51,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} CDB HLTbase) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HLT/sim/CMakeLists.txt b/HLT/sim/CMakeLists.txt index 07bbe7e5600..5e7b93c0c5f 100644 --- a/HLT/sim/CMakeLists.txt +++ b/HLT/sim/CMakeLists.txt @@ -56,7 +56,7 @@ add_definitions("-DLIBHLTSIM_VERSION=${LIBHLTSIM_VERSION}") add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") target_link_libraries(${MODULE} HLTbase) # System dependent: Modify the way the library is build diff --git a/HLT/trigger/CMakeLists.txt b/HLT/trigger/CMakeLists.txt index 3330d5f3ecc..71fbde67ebb 100644 --- a/HLT/trigger/CMakeLists.txt +++ b/HLT/trigger/CMakeLists.txt @@ -109,7 +109,7 @@ if(FASTJET_FOUND) endif(FASTJET_FOUND) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HMPID/DA/CMakeLists.txt b/HMPID/DA/CMakeLists.txt index 7b5d1d27f92..392d48d653d 100644 --- a/HMPID/DA/CMakeLists.txt +++ b/HMPID/DA/CMakeLists.txt @@ -51,7 +51,7 @@ target_link_libraries(HMPIDda HMPIDbase-static RAWDatarecOnline-static RAWDatare target_link_libraries(HMPIDphysda HMPIDbase-static RAWDatarecOnline-static RAWDatarec-static ${AMORE_AUXLIBS} daqDA ${DATE_MONLIBRARIES} ${DATE_RCPROXYLIBRARIES} Root RootExtra) # different flags -set(MODULE_COMPILE_FLAGS "-O -g ${DATE_CFLAGS} ${AMORE_CFLAGS}") +set(MODULE_COMPILE_FLAGS " ${DATE_CFLAGS} ${AMORE_CFLAGS}") set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${AMORE_STATICLIBS}") set_target_properties(HMPIDda PROPERTIES COMPILE_FLAGS ${MODULE_COMPILE_FLAGS}) diff --git a/HMPID/HMPIDbase/CMakeLists.txt b/HMPID/HMPIDbase/CMakeLists.txt index d296b0cca9b..e8d28e65a85 100644 --- a/HMPID/HMPIDbase/CMakeLists.txt +++ b/HMPID/HMPIDbase/CMakeLists.txt @@ -66,11 +66,16 @@ add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) # Follow headers dependencies add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object -add_library(${MODULE} SHARED $) +add_library(${MODULE} SHARED $) + target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -86,12 +91,16 @@ install(FILES ${HDRS} DESTINATION include) # Static version if DA enabled if(ALIROOT_STATIC) - add_library(${MODULE}-static STATIC $) + add_library(${MODULE}-static STATIC $) set_target_properties(${MODULE}-static PROPERTIES OUTPUT_NAME ${MODULE}) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/HMPID/HMPIDrec/CMakeLists.txt b/HMPID/HMPIDrec/CMakeLists.txt index 7ccfa2b3134..c6d9a6be97e 100644 --- a/HMPID/HMPIDrec/CMakeLists.txt +++ b/HMPID/HMPIDrec/CMakeLists.txt @@ -62,7 +62,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/HMPID/HMPIDsim/CMakeLists.txt b/HMPID/HMPIDsim/CMakeLists.txt index 6e89b4191a4..442afde580f 100644 --- a/HMPID/HMPIDsim/CMakeLists.txt +++ b/HMPID/HMPIDsim/CMakeLists.txt @@ -61,7 +61,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/ITS/DA/CMakeLists.txt b/ITS/DA/CMakeLists.txt index 6b7a79afb94..b3ea0d60e39 100644 --- a/ITS/DA/CMakeLists.txt +++ b/ITS/DA/CMakeLists.txt @@ -62,7 +62,7 @@ target_link_libraries(ITSSPDVertexDiamondda ITSrec-static RAWDatarec-static STEE target_link_libraries(ITSSSDPEDda ITSbase-static ${AMORE_AUXLIBS} daqDA ${DATE_MONLIBRARIES} ${DATE_RCPROXYLIBRARIES} Root RootExtra) # 8 # different flags -set(MODULE_COMPILE_FLAGS "-O -g ${DATE_CFLAGS} ${AMORE_CFLAGS}") +set(MODULE_COMPILE_FLAGS " ${DATE_CFLAGS} ${AMORE_CFLAGS}") set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${AMORE_STATICLIBS}") # 1 diff --git a/ITS/ITSbase/CMakeLists.txt b/ITS/ITSbase/CMakeLists.txt index 86d04fb51b4..b1551ed561c 100644 --- a/ITS/ITSbase/CMakeLists.txt +++ b/ITS/ITSbase/CMakeLists.txt @@ -169,16 +169,19 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} # Create an object to be reused in case of static libraries # Otherwise the sources will be compiled twice add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) -# Follow headers dependencies -add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object -add_library(${MODULE} SHARED $) +add_library(${MODULE} SHARED $) + target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Public include folders that will be propagated to the dependecies target_include_directories(${MODULE} PUBLIC ${incdirs}) -set(MODULE_COMPILE_FLAGS "-O -g -fPIC") +set(MODULE_COMPILE_FLAGS " ") if(DATE_FOUND) set(MODULE_COMPILE_FLAGS "${DATE_CFLAGS} ${MODULE_COMPILE_FLAGS}") endif(DATE_FOUND) @@ -200,7 +203,7 @@ install(FILES ${HDRS} DESTINATION include) # Static version if DA enabled if(ALIROOT_STATIC) - add_library(${MODULE}-static STATIC $) + add_library(${MODULE}-static STATIC $) set_target_properties(${MODULE}-static PROPERTIES OUTPUT_NAME ${MODULE}) # list of shared dependencies / the name of the variable containing the list of static ones diff --git a/ITS/ITSrec/CMakeLists.txt b/ITS/ITSrec/CMakeLists.txt index 81326d1b62e..aedd609b829 100644 --- a/ITS/ITSrec/CMakeLists.txt +++ b/ITS/ITSrec/CMakeLists.txt @@ -104,16 +104,18 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} # Create an object to be reused in case of static libraries # Otherwise the sources will be compiled twice add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) -# Follow headers dependencies -add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object -add_library(${MODULE} SHARED $) +add_library(${MODULE} SHARED $) + +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) # Linking library target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -129,12 +131,16 @@ install(FILES ${HDRS} DESTINATION include) # Static version if DA enabled if(ALIROOT_STATIC) - add_library(${MODULE}-static STATIC $) + add_library(${MODULE}-static STATIC $) set_target_properties(${MODULE}-static PROPERTIES OUTPUT_NAME ${MODULE}) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/ITS/ITSsim/CMakeLists.txt b/ITS/ITSsim/CMakeLists.txt index ba391ace88c..3d74d9ce42e 100644 --- a/ITS/ITSsim/CMakeLists.txt +++ b/ITS/ITSsim/CMakeLists.txt @@ -83,20 +83,21 @@ set(ALIROOT_DEPENDENCIES CDB ESD STEERBase STEER ITSbase RAWDatabase RAWDatarec) set(LIBDEPS ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h") - # Create an object to be reused in case of static libraries # Otherwise the sources will be compiled twice add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) -# Follow headers dependencies -add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object -add_library(${MODULE} SHARED $) +add_library(${MODULE} SHARED $) # linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -112,12 +113,16 @@ install(FILES ${HDRS} DESTINATION include) # Static version if DA enabled if(ALIROOT_STATIC) - add_library(${MODULE}-static STATIC $) + add_library(${MODULE}-static STATIC $) set_target_properties(${MODULE}-static PROPERTIES OUTPUT_NAME ${MODULE}) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/ITS/UPGRADE/ITSUpgradeBase/CMakeLists.txt b/ITS/UPGRADE/ITSUpgradeBase/CMakeLists.txt index 47f25ad9e92..3ef0eb14777 100644 --- a/ITS/UPGRADE/ITSUpgradeBase/CMakeLists.txt +++ b/ITS/UPGRADE/ITSUpgradeBase/CMakeLists.txt @@ -59,7 +59,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/ITS/UPGRADE/ITSUpgradeRec/CMakeLists.txt b/ITS/UPGRADE/ITSUpgradeRec/CMakeLists.txt index a56b557343a..fd238a7592e 100644 --- a/ITS/UPGRADE/ITSUpgradeRec/CMakeLists.txt +++ b/ITS/UPGRADE/ITSUpgradeRec/CMakeLists.txt @@ -71,7 +71,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/ITS/UPGRADE/ITSUpgradeSim/CMakeLists.txt b/ITS/UPGRADE/ITSUpgradeSim/CMakeLists.txt index 20572e73a05..149d35ac5c0 100644 --- a/ITS/UPGRADE/ITSUpgradeSim/CMakeLists.txt +++ b/ITS/UPGRADE/ITSUpgradeSim/CMakeLists.txt @@ -66,7 +66,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/JETAN/FASTJETAN/CMakeLists.txt b/JETAN/FASTJETAN/CMakeLists.txt index 4c52e86522e..32caf45dbdf 100644 --- a/JETAN/FASTJETAN/CMakeLists.txt +++ b/JETAN/FASTJETAN/CMakeLists.txt @@ -66,7 +66,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} ${FASTJET_LIBS}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/JETAN/JETAN/CMakeLists.txt b/JETAN/JETAN/CMakeLists.txt index e2c63833e43..892e98e3636 100644 --- a/JETAN/JETAN/CMakeLists.txt +++ b/JETAN/JETAN/CMakeLists.txt @@ -74,7 +74,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/LHAPDF/lhapdf-5.9.1/CMakeLists.txt b/LHAPDF/lhapdf-5.9.1/CMakeLists.txt index 0836c0ddc3b..9348627c5c8 100644 --- a/LHAPDF/lhapdf-5.9.1/CMakeLists.txt +++ b/LHAPDF/lhapdf-5.9.1/CMakeLists.txt @@ -131,7 +131,7 @@ add_definitions(-DDEFAULTPREFIXPATH="NONE" -DDEFAULTLHAPATH="${AliRoot_SOURCE_D # Additional compilation and linking flags set(CMAKE_C_FLAGS "-ansi ${CMAKE_C_FLAGS}") set(CMAKE_Fortran_FLAGS "-cpp") -set(MODULE_COMPILE_FLAGS "-O -g") +set(MODULE_COMPILE_FLAGS "") set(MODULE_LINK_FLAGS) # System dependent: Modify the way the library is build diff --git a/LHAPDF/lhapdf5.5.1/CMakeLists.txt b/LHAPDF/lhapdf5.5.1/CMakeLists.txt index 05e92903d5c..0e320f9f66a 100644 --- a/LHAPDF/lhapdf5.5.1/CMakeLists.txt +++ b/LHAPDF/lhapdf5.5.1/CMakeLists.txt @@ -108,7 +108,7 @@ add_definitions(-DDEFAULTPREFIXPATH="NONE" -DDEFAULTLHAPATH="${AliRoot_SOURCE_D # Additional compilation and linking flags set(CMAKE_C_FLAGS "-ansi ${CMAKE_C_FLAGS}") set(CMAKE_Fortran_FLAGS "-cpp") -set(MODULE_COMPILE_FLAGS "-O -g") +set(MODULE_COMPILE_FLAGS "") set(MODULE_LINK_FLAGS) # System dependent: Modify the way the library is build diff --git a/MFT/MFTbase/CMakeLists.txt b/MFT/MFTbase/CMakeLists.txt index 2b59a5841ca..732b1f18970 100644 --- a/MFT/MFTbase/CMakeLists.txt +++ b/MFT/MFTbase/CMakeLists.txt @@ -55,7 +55,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER AOD MUONbase MUONrec Core EG Gpad Graf Hist Matrix Physics RIO Tree) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/MFT/MFTrec/CMakeLists.txt b/MFT/MFTrec/CMakeLists.txt index 716c2e906d9..28ff2b3b457 100644 --- a/MFT/MFTrec/CMakeLists.txt +++ b/MFT/MFTrec/CMakeLists.txt @@ -63,7 +63,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER ESD CDB MUONbase MUONcore MUONevaluation MUONrec MFTbase MFTsim Core Geom Gpad Gpad Graf Hist MathCore Matrix Net Physics RIO Tree) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/MFT/MFTsim/CMakeLists.txt b/MFT/MFTsim/CMakeLists.txt index 44c9610c180..a3cbf90a7fb 100644 --- a/MFT/MFTsim/CMakeLists.txt +++ b/MFT/MFTsim/CMakeLists.txt @@ -52,7 +52,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER MUONbase MFTbase Core EG Geom Hist Physics RIO VMC) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/MICROCERN/CMakeLists.txt b/MICROCERN/CMakeLists.txt index 24350be2d63..080b264dd71 100644 --- a/MICROCERN/CMakeLists.txt +++ b/MICROCERN/CMakeLists.txt @@ -76,7 +76,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} ${FSRCS} ${CSRCS}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/MONITOR/MONITOR/CMakeLists.txt b/MONITOR/MONITOR/CMakeLists.txt index 80879d82f4e..bbdc8b6d26f 100644 --- a/MONITOR/MONITOR/CMakeLists.txt +++ b/MONITOR/MONITOR/CMakeLists.txt @@ -65,7 +65,7 @@ if(DIMDIR AND ODIR) endif() # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/MONITOR/MONITORzmq/CMakeLists.txt b/MONITOR/MONITORzmq/CMakeLists.txt index 969d4e07c2a..f866bb44623 100644 --- a/MONITOR/MONITORzmq/CMakeLists.txt +++ b/MONITOR/MONITORzmq/CMakeLists.txt @@ -76,7 +76,7 @@ if(DIMDIR AND ODIR) endif() # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/MONITOR/alionlinereco/CMakeLists.txt b/MONITOR/alionlinereco/CMakeLists.txt index 44e6f68edd6..3869a8c3d16 100644 --- a/MONITOR/alionlinereco/CMakeLists.txt +++ b/MONITOR/alionlinereco/CMakeLists.txt @@ -44,7 +44,7 @@ if(DATE_FOUND) endif(DATE_FOUND) # Additional compilation and linking flags -set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}") +set(MODULE_COMPILE_FLAGS " ${MODULE_COMPILE_FLAGS}") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/MONITOR/alitestproc/CMakeLists.txt b/MONITOR/alitestproc/CMakeLists.txt index 64c522798b4..c1af75e2a63 100644 --- a/MONITOR/alitestproc/CMakeLists.txt +++ b/MONITOR/alitestproc/CMakeLists.txt @@ -48,7 +48,7 @@ if(DATE_FOUND) endif(DATE_FOUND) # Additional compilation and linking flags -set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}") +set(MODULE_COMPILE_FLAGS " ${MODULE_COMPILE_FLAGS}") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/MONITOR/monitorCheck/CMakeLists.txt b/MONITOR/monitorCheck/CMakeLists.txt index 565f78ef868..301f4b77d39 100644 --- a/MONITOR/monitorCheck/CMakeLists.txt +++ b/MONITOR/monitorCheck/CMakeLists.txt @@ -48,7 +48,7 @@ if(DATE_FOUND) endif(DATE_FOUND) # Additional compilation and linking flags -set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}") +set(MODULE_COMPILE_FLAGS " ${MODULE_COMPILE_FLAGS}") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/MONITOR/monitorGDC/CMakeLists.txt b/MONITOR/monitorGDC/CMakeLists.txt index 7ea9c2e3e19..8d4f9f5b883 100644 --- a/MONITOR/monitorGDC/CMakeLists.txt +++ b/MONITOR/monitorGDC/CMakeLists.txt @@ -66,7 +66,7 @@ ENDIF(ZEROMQ_FOUND) target_link_libraries(${MODULE} ${MODULE_DEPENDENCIES}) # Additional compilation and linking flags -set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}") +set(MODULE_COMPILE_FLAGS " ${MODULE_COMPILE_FLAGS}") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/MUON/DA/CMakeLists.txt b/MUON/DA/CMakeLists.txt index 64dc2a3f0d6..c099108fcad 100644 --- a/MUON/DA/CMakeLists.txt +++ b/MUON/DA/CMakeLists.txt @@ -56,7 +56,7 @@ target_link_libraries(MUONTRKOCCda MUONraw MUONmapping MUONcore MUONcalib RAWDat target_link_libraries(MUONTRKPEDda HLTrec MUONsim MUONshuttle MUONraw MUONmapping MUONcore MUONcalib RAWDatarecOnline RAWDatarec ESD STEERBase ${AMORE_AUXLIBS} daqDA ${DATE_MONLIBRARIES} ${DATE_RCPROXYLIBRARIES} Root RootExtra) # different flags -set(MODULE_COMPILE_FLAGS "-O -g ${DATE_CFLAGS} ${AMORE_CFLAGS}") +set(MODULE_COMPILE_FLAGS "${DATE_CFLAGS} ${AMORE_CFLAGS}") set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${AMORE_STATICLIBS}") set_target_properties(MUONTRGda PROPERTIES COMPILE_FLAGS ${MODULE_COMPILE_FLAGS}) diff --git a/MUON/MUONbase/CMakeLists.txt b/MUON/MUONbase/CMakeLists.txt index 3c075406af3..01bd62bf683 100644 --- a/MUON/MUONbase/CMakeLists.txt +++ b/MUON/MUONbase/CMakeLists.txt @@ -99,8 +99,12 @@ add_library(${MODULE} SHARED $) # linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -122,6 +126,10 @@ if(ALIROOT_STATIC) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/MUON/MUONcalib/CMakeLists.txt b/MUON/MUONcalib/CMakeLists.txt index db994929faf..116905b902f 100644 --- a/MUON/MUONcalib/CMakeLists.txt +++ b/MUON/MUONcalib/CMakeLists.txt @@ -81,8 +81,12 @@ add_library(${MODULE} SHARED $) # linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -104,6 +108,10 @@ if(ALIROOT_STATIC) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/MUON/MUONcalign/CMakeLists.txt b/MUON/MUONcalign/CMakeLists.txt index 99eb9d96c8d..cc157e68de0 100644 --- a/MUON/MUONcalign/CMakeLists.txt +++ b/MUON/MUONcalign/CMakeLists.txt @@ -63,7 +63,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/MUON/MUONcore/CMakeLists.txt b/MUON/MUONcore/CMakeLists.txt index 41b6da9a10e..01b0bb9ba03 100644 --- a/MUON/MUONcore/CMakeLists.txt +++ b/MUON/MUONcore/CMakeLists.txt @@ -73,8 +73,12 @@ add_library(${MODULE} SHARED $) # linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -96,6 +100,10 @@ if(ALIROOT_STATIC) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/MUON/MUONevaluation/CMakeLists.txt b/MUON/MUONevaluation/CMakeLists.txt index f88c4d43885..06330a4b86e 100644 --- a/MUON/MUONevaluation/CMakeLists.txt +++ b/MUON/MUONevaluation/CMakeLists.txt @@ -69,7 +69,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/MUON/MUONgeometry/CMakeLists.txt b/MUON/MUONgeometry/CMakeLists.txt index faa9545d40b..a619681c598 100644 --- a/MUON/MUONgeometry/CMakeLists.txt +++ b/MUON/MUONgeometry/CMakeLists.txt @@ -75,8 +75,12 @@ add_library(${MODULE} SHARED $) # linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -98,6 +102,10 @@ if(ALIROOT_STATIC) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/MUON/MUONgraphics/CMakeLists.txt b/MUON/MUONgraphics/CMakeLists.txt index 3951156a940..8d88074da1f 100644 --- a/MUON/MUONgraphics/CMakeLists.txt +++ b/MUON/MUONgraphics/CMakeLists.txt @@ -98,7 +98,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/MUON/MUONmapping/CMakeLists.txt b/MUON/MUONmapping/CMakeLists.txt index c0424f11edf..15459956412 100644 --- a/MUON/MUONmapping/CMakeLists.txt +++ b/MUON/MUONmapping/CMakeLists.txt @@ -134,8 +134,12 @@ add_library(${MODULE} SHARED $) # linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -157,6 +161,10 @@ if(ALIROOT_STATIC) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/MUON/MUONmpgraphics/CMakeLists.txt b/MUON/MUONmpgraphics/CMakeLists.txt index a283837614d..bb62b48f008 100644 --- a/MUON/MUONmpgraphics/CMakeLists.txt +++ b/MUON/MUONmpgraphics/CMakeLists.txt @@ -60,7 +60,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/MUON/MUONraw/CMakeLists.txt b/MUON/MUONraw/CMakeLists.txt index 97d79e68fa4..f27137dbe66 100644 --- a/MUON/MUONraw/CMakeLists.txt +++ b/MUON/MUONraw/CMakeLists.txt @@ -77,8 +77,12 @@ add_library(${MODULE} SHARED $) # linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -100,6 +104,10 @@ if(ALIROOT_STATIC) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/MUON/MUONrec/CMakeLists.txt b/MUON/MUONrec/CMakeLists.txt index 40c95d441fc..ec1118442fc 100644 --- a/MUON/MUONrec/CMakeLists.txt +++ b/MUON/MUONrec/CMakeLists.txt @@ -103,7 +103,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/MUON/MUONshuttle/CMakeLists.txt b/MUON/MUONshuttle/CMakeLists.txt index 8dc4b0c0e72..c454a9f8e1d 100644 --- a/MUON/MUONshuttle/CMakeLists.txt +++ b/MUON/MUONshuttle/CMakeLists.txt @@ -74,8 +74,12 @@ add_library(${MODULE} SHARED $) # linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -97,6 +101,10 @@ if(ALIROOT_STATIC) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/MUON/MUONsim/CMakeLists.txt b/MUON/MUONsim/CMakeLists.txt index e92793a1414..c9ec460fe6f 100644 --- a/MUON/MUONsim/CMakeLists.txt +++ b/MUON/MUONsim/CMakeLists.txt @@ -86,14 +86,16 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} # Create an object to be reused in case of static libraries # Otherwise the sources will be compiled twice add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) -# Follow headers dependencies -add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object add_library(${MODULE} SHARED $) # linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags set(TARGETFLAGS "-g") @@ -108,7 +110,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) endif() endif() -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-fPIC ${TARGETFLAGS}") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ${TARGETFLAGS}") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -130,6 +132,10 @@ if(ALIROOT_STATIC) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/MUON/MUONtrigger/CMakeLists.txt b/MUON/MUONtrigger/CMakeLists.txt index a236cce6dde..4c27f81324e 100644 --- a/MUON/MUONtrigger/CMakeLists.txt +++ b/MUON/MUONtrigger/CMakeLists.txt @@ -69,8 +69,12 @@ add_library(${MODULE} SHARED $) # linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -92,6 +96,10 @@ if(ALIROOT_STATIC) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/OADB/CMakeLists.txt b/OADB/CMakeLists.txt index 6e5a091ba20..16d2b312832 100644 --- a/OADB/CMakeLists.txt +++ b/OADB/CMakeLists.txt @@ -51,7 +51,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/PHOS/DA/CMakeLists.txt b/PHOS/DA/CMakeLists.txt index d76acaa4f03..592658f0f0d 100644 --- a/PHOS/DA/CMakeLists.txt +++ b/PHOS/DA/CMakeLists.txt @@ -55,7 +55,7 @@ target_link_libraries(PHOSLEDda PHOSbase-static PHOSshuttle-static RAWDatabase-s target_link_libraries(PHOSPEDda RAWDatabase-static RAWDatarec-static STEERBase-static ${AMORE_AUXLIBS} daqDA ${DATE_MONLIBRARIES} ${DATE_RCPROXYLIBRARIES} Root RootExtra) # 4 # different flags -set(MODULE_COMPILE_FLAGS "-O -g ${DATE_CFLAGS} ${AMORE_CFLAGS}") +set(MODULE_COMPILE_FLAGS " ${DATE_CFLAGS} ${AMORE_CFLAGS}") set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${AMORE_STATICLIBS}") set_target_properties(PHOSBCMda PROPERTIES COMPILE_FLAGS ${MODULE_COMPILE_FLAGS}) diff --git a/PHOS/PHOSUtils/CMakeLists.txt b/PHOS/PHOSUtils/CMakeLists.txt index d4904430642..7ec8eb228e3 100644 --- a/PHOS/PHOSUtils/CMakeLists.txt +++ b/PHOS/PHOSUtils/CMakeLists.txt @@ -60,8 +60,12 @@ add_library(${MODULE} SHARED $) # Linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ALIROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") add_definitions(-D__PHOSUTIL__) # System dependent: Modify the way the library is build @@ -84,6 +88,10 @@ if(ALIROOT_STATIC) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/PHOS/PHOSbase/CMakeLists.txt b/PHOS/PHOSbase/CMakeLists.txt index 3f48e092805..e56973a4dd2 100644 --- a/PHOS/PHOSbase/CMakeLists.txt +++ b/PHOS/PHOSbase/CMakeLists.txt @@ -110,8 +110,12 @@ add_library(${MODULE} SHARED $) # Linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -133,6 +137,10 @@ if(ALIROOT_STATIC) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/PHOS/PHOSpi0Calib/CMakeLists.txt b/PHOS/PHOSpi0Calib/CMakeLists.txt index 8e0dac0f22c..ff2abc2d0e5 100644 --- a/PHOS/PHOSpi0Calib/CMakeLists.txt +++ b/PHOS/PHOSpi0Calib/CMakeLists.txt @@ -53,7 +53,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/PHOS/PHOSrec/CMakeLists.txt b/PHOS/PHOSrec/CMakeLists.txt index 18710966d68..d75afb4a119 100644 --- a/PHOS/PHOSrec/CMakeLists.txt +++ b/PHOS/PHOSrec/CMakeLists.txt @@ -76,8 +76,12 @@ add_library(${MODULE} SHARED $) # Linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ALIROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -99,6 +103,10 @@ if(ALIROOT_STATIC) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/PHOS/PHOSshuttle/CMakeLists.txt b/PHOS/PHOSshuttle/CMakeLists.txt index 883df0f01c7..1d460fbf13d 100644 --- a/PHOS/PHOSshuttle/CMakeLists.txt +++ b/PHOS/PHOSshuttle/CMakeLists.txt @@ -67,8 +67,12 @@ add_library(${MODULE} SHARED $) # Linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ALIROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -90,6 +94,10 @@ if(ALIROOT_STATIC) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/PHOS/PHOSsim/CMakeLists.txt b/PHOS/PHOSsim/CMakeLists.txt index 02b5fdc78d2..a426d9b851e 100644 --- a/PHOS/PHOSsim/CMakeLists.txt +++ b/PHOS/PHOSsim/CMakeLists.txt @@ -70,8 +70,12 @@ add_library(${MODULE} SHARED $) # Linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ALIROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -93,6 +97,10 @@ if(ALIROOT_STATIC) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/PMD/DA/CMakeLists.txt b/PMD/DA/CMakeLists.txt index bcda9b9dc1a..9decdf630b6 100644 --- a/PMD/DA/CMakeLists.txt +++ b/PMD/DA/CMakeLists.txt @@ -51,7 +51,7 @@ target_link_libraries(PMDGAINda CDB-static PMDrec-static RAWDatarec-static STEER target_link_libraries(PMDPEDESTALda CDB-static PMDrec-static RAWDatarec-static STEERBase-static ${AMORE_AUXLIBS} daqDA ${DATE_MONLIBRARIES} ${DATE_RCPROXYLIBRARIES} Root RootExtra) # 2 # different flags -set(MODULE_COMPILE_FLAGS "-O -g ${DATE_CFLAGS} ${AMORE_CFLAGS}") +set(MODULE_COMPILE_FLAGS " ${DATE_CFLAGS} ${AMORE_CFLAGS}") set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${AMORE_STATICLIBS}") set_target_properties(PMDGAINda PROPERTIES COMPILE_FLAGS ${MODULE_COMPILE_FLAGS}) diff --git a/PMD/PMDbase/CMakeLists.txt b/PMD/PMDbase/CMakeLists.txt index 6bea95fcb65..b3bd937c0d9 100644 --- a/PMD/PMDbase/CMakeLists.txt +++ b/PMD/PMDbase/CMakeLists.txt @@ -79,8 +79,12 @@ add_library(${MODULE} SHARED $) # Linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -102,6 +106,10 @@ if(ALIROOT_STATIC) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/PMD/PMDrec/CMakeLists.txt b/PMD/PMDrec/CMakeLists.txt index df35ba800bf..38c8ff11eb5 100644 --- a/PMD/PMDrec/CMakeLists.txt +++ b/PMD/PMDrec/CMakeLists.txt @@ -89,8 +89,12 @@ add_library(${MODULE} SHARED $) # Linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -113,6 +117,10 @@ if(ALIROOT_STATIC) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/PMD/PMDsim/CMakeLists.txt b/PMD/PMDsim/CMakeLists.txt index aecf8f7a56e..6d515c396db 100644 --- a/PMD/PMDsim/CMakeLists.txt +++ b/PMD/PMDsim/CMakeLists.txt @@ -59,7 +59,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/PYTHIA6/AliPythia6/CMakeLists.txt b/PYTHIA6/AliPythia6/CMakeLists.txt index a0fd5187996..ab93d1aa9c0 100644 --- a/PYTHIA6/AliPythia6/CMakeLists.txt +++ b/PYTHIA6/AliPythia6/CMakeLists.txt @@ -62,7 +62,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx ${FSRCS}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/PYTHIA6/QPYTHIA/CMakeLists.txt b/PYTHIA6/QPYTHIA/CMakeLists.txt index 845eb56df34..b544e3c73c2 100644 --- a/PYTHIA6/QPYTHIA/CMakeLists.txt +++ b/PYTHIA6/QPYTHIA/CMakeLists.txt @@ -65,7 +65,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx ${FSRCS} ${CSRCS}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/PYTHIA6/pythia6.4.21/CMakeLists.txt b/PYTHIA6/pythia6.4.21/CMakeLists.txt index a8e5c711bbe..66a868a8401 100644 --- a/PYTHIA6/pythia6.4.21/CMakeLists.txt +++ b/PYTHIA6/pythia6.4.21/CMakeLists.txt @@ -62,7 +62,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx ${FSRCS} ${CSRCS}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/PYTHIA6/pythia6.4.25/CMakeLists.txt b/PYTHIA6/pythia6.4.25/CMakeLists.txt index c4b6f0d70ab..d4aa96e5e30 100644 --- a/PYTHIA6/pythia6.4.25/CMakeLists.txt +++ b/PYTHIA6/pythia6.4.25/CMakeLists.txt @@ -64,7 +64,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx ${FSRCS} ${CSRCS}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/PYTHIA6/pythia6/CMakeLists.txt b/PYTHIA6/pythia6/CMakeLists.txt index 1e3838c80eb..9fc8fed0c41 100644 --- a/PYTHIA6/pythia6/CMakeLists.txt +++ b/PYTHIA6/pythia6/CMakeLists.txt @@ -61,7 +61,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx ${FSRCS} ${CSRCS}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/PYTHIA8/AliPythia8/CMakeLists.txt b/PYTHIA8/AliPythia8/CMakeLists.txt index 64f1e3b420a..cec199b4c62 100644 --- a/PYTHIA8/AliPythia8/CMakeLists.txt +++ b/PYTHIA8/AliPythia8/CMakeLists.txt @@ -55,7 +55,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/PYTHIA8/pythia8175/CMakeLists.txt b/PYTHIA8/pythia8175/CMakeLists.txt index 7879e995ab4..0fcdee6e421 100644 --- a/PYTHIA8/pythia8175/CMakeLists.txt +++ b/PYTHIA8/pythia8175/CMakeLists.txt @@ -92,7 +92,7 @@ add_library(${MODULE} SHARED ${SRCS}) # Do not generate the ROOT map # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") target_link_libraries(${MODULE} ) # System dependent: Modify the way the library is build diff --git a/RAW/MDC/CMakeLists.txt b/RAW/MDC/CMakeLists.txt index d21c70807f4..b5225ce7ec1 100644 --- a/RAW/MDC/CMakeLists.txt +++ b/RAW/MDC/CMakeLists.txt @@ -62,8 +62,13 @@ add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object add_library(${MODULE} SHARED $) + target_link_libraries(${MODULE} ${ROOT_DEPENDENCIES} ${ALIROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Public include folders that will be propagated to the dependecies target_include_directories(${MODULE} PUBLIC ${incdirs}) @@ -77,7 +82,7 @@ if(DATE_FOUND) endif(DATE_FOUND) # Additional compilation and linking flags -set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}") +set(MODULE_COMPILE_FLAGS " ${MODULE_COMPILE_FLAGS}") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/RAW/RAWDatabase/CMakeLists.txt b/RAW/RAWDatabase/CMakeLists.txt index cb480f0bbb7..378f0256f69 100644 --- a/RAW/RAWDatabase/CMakeLists.txt +++ b/RAW/RAWDatabase/CMakeLists.txt @@ -76,6 +76,10 @@ add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) add_library(${MODULE} SHARED $) target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Public include folders that will be propagated to the dependecies target_include_directories(${MODULE} PUBLIC ${incdirs}) @@ -88,7 +92,7 @@ if(DATE_FOUND) endif(DATE_FOUND) # Additional compilation and linking flags -set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}") +set(MODULE_COMPILE_FLAGS " ${MODULE_COMPILE_FLAGS}") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/RAW/RAWDatarec/CMakeLists.txt b/RAW/RAWDatarec/CMakeLists.txt index 66d5349fd65..cdd6171a785 100644 --- a/RAW/RAWDatarec/CMakeLists.txt +++ b/RAW/RAWDatarec/CMakeLists.txt @@ -69,6 +69,10 @@ add_library(${MODULE} SHARED $) target_link_libraries(${MODULE} LINK_PUBLIC ${ROOT_DEPENDENCIES} ${ALIROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Public include folders that will be propagated to the dependecies target_include_directories(${MODULE} PUBLIC ${incdirs}) @@ -82,7 +86,7 @@ if(DATE_FOUND) endif(DATE_FOUND) # Additional compilation and linking flags -set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}") +set(MODULE_COMPILE_FLAGS " ${MODULE_COMPILE_FLAGS}") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/RAW/RAWDatarecOnline/CMakeLists.txt b/RAW/RAWDatarecOnline/CMakeLists.txt index df6297783c3..d95118de59e 100644 --- a/RAW/RAWDatarecOnline/CMakeLists.txt +++ b/RAW/RAWDatarecOnline/CMakeLists.txt @@ -58,6 +58,10 @@ add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) add_library(${MODULE} SHARED $) target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Public include folders that will be propagated to the dependecies target_include_directories(${MODULE} PUBLIC ${incdirs}) @@ -71,7 +75,7 @@ if(DATE_FOUND) endif(DATE_FOUND) # Additional compilation and linking flags -set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}") +set(MODULE_COMPILE_FLAGS " ${MODULE_COMPILE_FLAGS}") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/RAW/RAWDatasim/CMakeLists.txt b/RAW/RAWDatasim/CMakeLists.txt index be9203eb616..7de9d8ba758 100644 --- a/RAW/RAWDatasim/CMakeLists.txt +++ b/RAW/RAWDatasim/CMakeLists.txt @@ -58,6 +58,10 @@ add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) add_library(${MODULE} SHARED $) target_link_libraries(${MODULE} ${ROOT_DEPENDENCIES} ${ALIROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Public include folders that will be propagated to the dependecies target_include_directories(${MODULE} PUBLIC ${incdirs}) @@ -71,7 +75,7 @@ if(DATE_FOUND) endif(DATE_FOUND) # Additional compilation and linking flags -set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}") +set(MODULE_COMPILE_FLAGS " ${MODULE_COMPILE_FLAGS}") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/RAW/alimdc/CMakeLists.txt b/RAW/alimdc/CMakeLists.txt index 5d62dac811a..9ff35299cfb 100644 --- a/RAW/alimdc/CMakeLists.txt +++ b/RAW/alimdc/CMakeLists.txt @@ -45,7 +45,7 @@ if(DATE_FOUND) endif(DATE_FOUND) # Additional compilation and linking flags -set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}") +set(MODULE_COMPILE_FLAGS " ${MODULE_COMPILE_FLAGS}") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/RAW/dateStream/CMakeLists.txt b/RAW/dateStream/CMakeLists.txt index dbdc52203b1..79991ddc007 100644 --- a/RAW/dateStream/CMakeLists.txt +++ b/RAW/dateStream/CMakeLists.txt @@ -45,7 +45,7 @@ if(DATE_FOUND) endif(DATE_FOUND) # Additional compilation and linking flags -set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}") +set(MODULE_COMPILE_FLAGS " ${MODULE_COMPILE_FLAGS}") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/SHUTTLE/CMakeLists.txt b/SHUTTLE/CMakeLists.txt index 70279c2ce66..0146a3ae017 100644 --- a/SHUTTLE/CMakeLists.txt +++ b/SHUTTLE/CMakeLists.txt @@ -63,7 +63,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase CDB dim Core Eve Gui Hist Minuit2 Minuit Net ProofPlayer RIO Spectrum Thread TMVA) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/STARLIGHT/AliStarLight/CMakeLists.txt b/STARLIGHT/AliStarLight/CMakeLists.txt index 7ade12e72a1..fd3efd8ab6d 100644 --- a/STARLIGHT/AliStarLight/CMakeLists.txt +++ b/STARLIGHT/AliStarLight/CMakeLists.txt @@ -51,7 +51,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/STARLIGHT/starlight/CMakeLists.txt b/STARLIGHT/starlight/CMakeLists.txt index e37dbe646cf..73a0a800449 100644 --- a/STARLIGHT/starlight/CMakeLists.txt +++ b/STARLIGHT/starlight/CMakeLists.txt @@ -71,7 +71,7 @@ configure_file(${AliRoot_SOURCE_DIR}/STARLIGHT/starlight/starlightconfig.h.in add_library(${MODULE} SHARED ${SRCS}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/STAT/CMakeLists.txt b/STAT/CMakeLists.txt index 268203b54a0..505fe637bf5 100644 --- a/STAT/CMakeLists.txt +++ b/STAT/CMakeLists.txt @@ -51,7 +51,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/STEER/AOD/CMakeLists.txt b/STEER/AOD/CMakeLists.txt index dffe1737dc3..129c7a31612 100644 --- a/STEER/AOD/CMakeLists.txt +++ b/STEER/AOD/CMakeLists.txt @@ -98,11 +98,15 @@ add_library(${MODULE} SHARED $) # library dependecies target_link_libraries(${MODULE} ${ROOT_DEPENDENCIES} ${ALIROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Public include folders that will be propagated to the dependecies target_include_directories(${MODULE} PUBLIC ${incdirs}) # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/STEER/CDB/CMakeLists.txt b/STEER/CDB/CMakeLists.txt index b1732a2040f..eeacfb68b06 100644 --- a/STEER/CDB/CMakeLists.txt +++ b/STEER/CDB/CMakeLists.txt @@ -80,11 +80,15 @@ add_library(${MODULE} SHARED $) # Linking library target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Public include folders that will be propagated to the dependecies target_include_directories(${MODULE} PUBLIC ${incdirs}) # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/STEER/ESD/CMakeLists.txt b/STEER/ESD/CMakeLists.txt index e3281f3e313..175ecb15830 100644 --- a/STEER/ESD/CMakeLists.txt +++ b/STEER/ESD/CMakeLists.txt @@ -119,18 +119,20 @@ generate_rootmap("ESD" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDe # Create an object to be reused in case of static libraries # Otherwise the sources will be compiled twice add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) -# Follow headers dependencies -add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object add_library(${MODULE} SHARED $) target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Public include folders that will be propagated to the dependecies target_include_directories(${MODULE} PUBLIC ${incdirs}) # Additional compilation flags for the object -set_target_properties(ESD-object PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(ESD-object PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/STEER/STEER/CMakeLists.txt b/STEER/STEER/CMakeLists.txt index 4b7f05c7e9d..9782d3bfe3f 100644 --- a/STEER/STEER/CMakeLists.txt +++ b/STEER/STEER/CMakeLists.txt @@ -176,18 +176,20 @@ add_definitions("-DLIBHLTSIM_VERSION=${LIBHLTSIM_VERSION}") # Create an object to be reused in case of static libraries # Otherwise the sources will be compiled twice add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) -# Dependencies for the object -add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object add_library(${MODULE} SHARED $) target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Public include folders that will be propagated to the dependecies target_include_directories(${MODULE} PUBLIC ${incdirs}) # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -202,7 +204,7 @@ install(FILES ${HDRS} DESTINATION include) # Static version if DA enabled if(ALIROOT_STATIC) - add_library(${MODULE}-static STATIC $) + add_library(${MODULE}-static STATIC $) set_target_properties(${MODULE}-static PROPERTIES OUTPUT_NAME ${MODULE}) # list of shared dependencies / the name of the variable containing the list of static ones @@ -219,3 +221,4 @@ if(ALIROOT_STATIC) ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) endif(ALIROOT_STATIC) + diff --git a/STRUCT/CMakeLists.txt b/STRUCT/CMakeLists.txt index e22e52e99c3..309c018e0cd 100644 --- a/STRUCT/CMakeLists.txt +++ b/STRUCT/CMakeLists.txt @@ -64,7 +64,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/T0/DA/CMakeLists.txt b/T0/DA/CMakeLists.txt index 79859586c38..65dfccdd157 100644 --- a/T0/DA/CMakeLists.txt +++ b/T0/DA/CMakeLists.txt @@ -52,7 +52,7 @@ target_link_libraries(T0Laserda RAWDatarec-static T0base-static ${AMORE_AUXLIBS} target_link_libraries(T0Physda CDB-static RAWDatarec-static T0base-static ${AMORE_AUXLIBS} daqDA ${DATE_MONLIBRARIES} ${DATE_RCPROXYLIBRARIES} Root RootExtra) # 3 # different flags -set(MODULE_COMPILE_FLAGS "-O -g ${DATE_CFLAGS} ${AMORE_CFLAGS}") +set(MODULE_COMPILE_FLAGS " ${DATE_CFLAGS} ${AMORE_CFLAGS}") set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${AMORE_STATICLIBS}") set_target_properties(T0Cosmicda PROPERTIES COMPILE_FLAGS ${MODULE_COMPILE_FLAGS}) diff --git a/T0/T0base/CMakeLists.txt b/T0/T0base/CMakeLists.txt index 0e2fff54838..d8da41af03f 100644 --- a/T0/T0base/CMakeLists.txt +++ b/T0/T0base/CMakeLists.txt @@ -80,8 +80,12 @@ add_library(${MODULE} SHARED $) # Linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -103,6 +107,10 @@ if(ALIROOT_STATIC) # list of shared dependencies / the name of the variable containing the list of static ones generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") # Installation diff --git a/T0/T0calib/CMakeLists.txt b/T0/T0calib/CMakeLists.txt index 48f1bde1465..2158bf7656a 100644 --- a/T0/T0calib/CMakeLists.txt +++ b/T0/T0calib/CMakeLists.txt @@ -57,7 +57,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/T0/T0rec/CMakeLists.txt b/T0/T0rec/CMakeLists.txt index 9e8662c6e61..edae015f3f9 100644 --- a/T0/T0rec/CMakeLists.txt +++ b/T0/T0rec/CMakeLists.txt @@ -58,7 +58,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/T0/T0shuttle/CMakeLists.txt b/T0/T0shuttle/CMakeLists.txt index d244855d1d7..47f2021261b 100644 --- a/T0/T0shuttle/CMakeLists.txt +++ b/T0/T0shuttle/CMakeLists.txt @@ -51,7 +51,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/T0/T0sim/CMakeLists.txt b/T0/T0sim/CMakeLists.txt index eb728aaa7d2..bd73bed93c4 100644 --- a/T0/T0sim/CMakeLists.txt +++ b/T0/T0sim/CMakeLists.txt @@ -55,7 +55,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TAmpt/TAmpt/CMakeLists.txt b/TAmpt/TAmpt/CMakeLists.txt index 0cfa8f7f4c7..e02d5aeb8d6 100644 --- a/TAmpt/TAmpt/CMakeLists.txt +++ b/TAmpt/TAmpt/CMakeLists.txt @@ -51,7 +51,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TDPMjet/CMakeLists.txt b/TDPMjet/CMakeLists.txt index 5ebd582cc95..7f14f6192c6 100644 --- a/TDPMjet/CMakeLists.txt +++ b/TDPMjet/CMakeLists.txt @@ -51,7 +51,7 @@ set(LIBDEPS DPMJET EVGEN STEER STEERBase) generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h") # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") target_link_libraries(${MODULE}) # System dependent: Modify the way the library is build diff --git a/TEPEMGEN/CMakeLists.txt b/TEPEMGEN/CMakeLists.txt index e0648982f14..765347d1333 100644 --- a/TEPEMGEN/CMakeLists.txt +++ b/TEPEMGEN/CMakeLists.txt @@ -57,7 +57,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx ${FSRCS}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TEvtGen/EvtGen/CMakeLists.txt b/TEvtGen/EvtGen/CMakeLists.txt index 1ffdc5ebcbe..73ab029588c 100644 --- a/TEvtGen/EvtGen/CMakeLists.txt +++ b/TEvtGen/EvtGen/CMakeLists.txt @@ -309,7 +309,7 @@ add_library(${MODULE} SHARED ${SRCS} ${FSRCS}) # Do not generate the ROOT map # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") target_link_libraries(${MODULE} ) # System dependent: Modify the way the library is build diff --git a/TEvtGen/EvtGenExternal/CMakeLists.txt b/TEvtGen/EvtGenExternal/CMakeLists.txt index 3d5e116c5ac..085516c5e90 100644 --- a/TEvtGen/EvtGenExternal/CMakeLists.txt +++ b/TEvtGen/EvtGenExternal/CMakeLists.txt @@ -57,7 +57,7 @@ set (EVTGEN_TAUOLA "ON") add_definitions ("-DEVTGEN_PYTHIA -DEVTGEN_PHOTOS -DEVTGEN_TAUOLA") -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") target_link_libraries(${MODULE} ) # System dependent: Modify the way the library is build diff --git a/TEvtGen/HepMC/CMakeLists.txt b/TEvtGen/HepMC/CMakeLists.txt index c22a09b0a64..ab1369bc7e7 100644 --- a/TEvtGen/HepMC/CMakeLists.txt +++ b/TEvtGen/HepMC/CMakeLists.txt @@ -60,7 +60,7 @@ add_library(${MODULE} SHARED ${SRCS}) # Do not generate the ROOT map # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") target_link_libraries(${MODULE} ) # System dependent: Modify the way the library is build diff --git a/TEvtGen/Photos/CMakeLists.txt b/TEvtGen/Photos/CMakeLists.txt index b1894390a00..cf7caca52e0 100644 --- a/TEvtGen/Photos/CMakeLists.txt +++ b/TEvtGen/Photos/CMakeLists.txt @@ -55,7 +55,7 @@ add_library(${MODULE} SHARED ${SRCS}) # Do not generate the ROOT map # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") target_link_libraries(${MODULE} ) # System dependent: Modify the way the library is build diff --git a/TEvtGen/TEvtGen/CMakeLists.txt b/TEvtGen/TEvtGen/CMakeLists.txt index 31a9f712534..84b1e665f08 100644 --- a/TEvtGen/TEvtGen/CMakeLists.txt +++ b/TEvtGen/TEvtGen/CMakeLists.txt @@ -52,7 +52,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TEvtGen/THepMCParser/CMakeLists.txt b/TEvtGen/THepMCParser/CMakeLists.txt index 3c447ae9acc..1d425748893 100644 --- a/TEvtGen/THepMCParser/CMakeLists.txt +++ b/TEvtGen/THepMCParser/CMakeLists.txt @@ -47,7 +47,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TEvtGen/Tauola/CMakeLists.txt b/TEvtGen/Tauola/CMakeLists.txt index 56b45b53f7c..2454421fb80 100644 --- a/TEvtGen/Tauola/CMakeLists.txt +++ b/TEvtGen/Tauola/CMakeLists.txt @@ -72,8 +72,8 @@ add_library(${MODULE} SHARED ${SRCS} ${FSRCS}) # Do not generate the ROOT map # Additional compilation flags -set( CMAKE_Fortran_FLAGS "-O2 -fPIC -fno-automatic -fno-backslash -ffixed-line-length-132") -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set( CMAKE_Fortran_FLAGS "-O2 -fno-automatic -fno-backslash -ffixed-line-length-132") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") target_link_libraries(${MODULE} ) # System dependent: Modify the way the library is build diff --git a/THbtp/CMakeLists.txt b/THbtp/CMakeLists.txt index be87ccfe691..5626f010160 100644 --- a/THbtp/CMakeLists.txt +++ b/THbtp/CMakeLists.txt @@ -53,7 +53,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx ${FSRCS}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/THerwig/CMakeLists.txt b/THerwig/CMakeLists.txt index b4790730873..c8a9ef86359 100644 --- a/THerwig/CMakeLists.txt +++ b/THerwig/CMakeLists.txt @@ -52,7 +52,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/THijing/CMakeLists.txt b/THijing/CMakeLists.txt index e51e0286162..1e27d348875 100644 --- a/THijing/CMakeLists.txt +++ b/THijing/CMakeLists.txt @@ -56,7 +56,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx ${FSRCS}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/THydjet/CMakeLists.txt b/THydjet/CMakeLists.txt index a9c1a1c9709..585b43d3924 100644 --- a/THydjet/CMakeLists.txt +++ b/THydjet/CMakeLists.txt @@ -58,7 +58,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx ${FSRCS}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TOF/DA/CMakeLists.txt b/TOF/DA/CMakeLists.txt index 51879343058..2b7cbe115af 100644 --- a/TOF/DA/CMakeLists.txt +++ b/TOF/DA/CMakeLists.txt @@ -52,7 +52,7 @@ target_link_libraries(TOFphysicsda RAWDatarec-static STEERBase-static TOFbase-st target_link_libraries(TOFpulserda RAWDatarec-static STEERBase-static TOFbase-static ${AMORE_AUXLIBS} daqDA ${DATE_MONLIBRARIES} ${DATE_RCPROXYLIBRARIES} Root RootExtra) # 5 # different flags -set(MODULE_COMPILE_FLAGS "-O -g ${DATE_CFLAGS} ${AMORE_CFLAGS}") +set(MODULE_COMPILE_FLAGS " ${DATE_CFLAGS} ${AMORE_CFLAGS}") set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${AMORE_STATICLIBS}") set_target_properties(TOFcalibda PROPERTIES COMPILE_FLAGS ${MODULE_COMPILE_FLAGS}) diff --git a/TOF/TOFbase/CMakeLists.txt b/TOF/TOFbase/CMakeLists.txt index cc5134d5c9f..027081db8c7 100644 --- a/TOF/TOFbase/CMakeLists.txt +++ b/TOF/TOFbase/CMakeLists.txt @@ -110,11 +110,15 @@ add_library(${MODULE} SHARED $) # Linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Public include folders that will be propagated to the dependecies target_include_directories(${MODULE} PUBLIC ${incdirs}) # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TOF/TOFcalib/CMakeLists.txt b/TOF/TOFcalib/CMakeLists.txt index 7901c940628..3601b6902d1 100644 --- a/TOF/TOFcalib/CMakeLists.txt +++ b/TOF/TOFcalib/CMakeLists.txt @@ -56,7 +56,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TOF/TOFrec/CMakeLists.txt b/TOF/TOFrec/CMakeLists.txt index e8ec72eb307..b0ae975ebc9 100644 --- a/TOF/TOFrec/CMakeLists.txt +++ b/TOF/TOFrec/CMakeLists.txt @@ -65,7 +65,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TOF/TOFsim/CMakeLists.txt b/TOF/TOFsim/CMakeLists.txt index b8656b95c18..9f823c1c37e 100644 --- a/TOF/TOFsim/CMakeLists.txt +++ b/TOF/TOFsim/CMakeLists.txt @@ -66,7 +66,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TPC/DA/CMakeLists.txt b/TPC/DA/CMakeLists.txt index d71edfd2345..71301a02d19 100644 --- a/TPC/DA/CMakeLists.txt +++ b/TPC/DA/CMakeLists.txt @@ -54,7 +54,7 @@ target_link_libraries(TPCQAda RAWDatarec-static STEERBase-static TPCbase-static target_link_libraries(TPCRAWda RAWDatarec-static STEERBase-static TPCbase-static ${AMORE_AUXLIBS} daqDA ${DATE_MONLIBRARIES} ${DATE_RCPROXYLIBRARIES} Root RootExtra) # 6 # different flags -set(MODULE_COMPILE_FLAGS "-O -g ${DATE_CFLAGS} ${AMORE_CFLAGS}") +set(MODULE_COMPILE_FLAGS " ${DATE_CFLAGS} ${AMORE_CFLAGS}") set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${AMORE_STATICLIBS}") set_target_properties(TPCCEda PROPERTIES COMPILE_FLAGS ${MODULE_COMPILE_FLAGS}) # 1 diff --git a/TPC/TPCbase/CMakeLists.txt b/TPC/TPCbase/CMakeLists.txt index 3436a4b4830..d1b80332502 100644 --- a/TPC/TPCbase/CMakeLists.txt +++ b/TPC/TPCbase/CMakeLists.txt @@ -133,11 +133,15 @@ add_library(${MODULE} SHARED $) # Linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Public include folders that will be propagated to the dependecies target_include_directories(${MODULE} PUBLIC ${incdirs}) # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TPC/TPCcalib/CMakeLists.txt b/TPC/TPCcalib/CMakeLists.txt index ac74bfdf831..0f731b8e314 100644 --- a/TPC/TPCcalib/CMakeLists.txt +++ b/TPC/TPCcalib/CMakeLists.txt @@ -80,7 +80,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase CDB ESD STEER ANALYSIS ANALYSISalice STAT RAWDatarec RAWDatabase TPCbase TPCrec Core EG Geom Gpad Graf Hist MathCore Matrix Minuit Postscript Proof RIO Tree) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TPC/TPCmon/CMakeLists.txt b/TPC/TPCmon/CMakeLists.txt index 938ee2f9b46..841e4ab9139 100644 --- a/TPC/TPCmon/CMakeLists.txt +++ b/TPC/TPCmon/CMakeLists.txt @@ -73,7 +73,7 @@ if(DATE_FOUND) endif(DATE_FOUND) # Additional compilation and linking flags -set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}") +set(MODULE_COMPILE_FLAGS " ${MODULE_COMPILE_FLAGS}") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TPC/TPCrec/CMakeLists.txt b/TPC/TPCrec/CMakeLists.txt index 546e47e1dc5..410f7ced948 100644 --- a/TPC/TPCrec/CMakeLists.txt +++ b/TPC/TPCrec/CMakeLists.txt @@ -82,7 +82,7 @@ target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) target_include_directories(${MODULE} PUBLIC ${incdirs}) # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TPC/TPCsim/CMakeLists.txt b/TPC/TPCsim/CMakeLists.txt index d020fed4237..3df3c54c05a 100644 --- a/TPC/TPCsim/CMakeLists.txt +++ b/TPC/TPCsim/CMakeLists.txt @@ -73,11 +73,15 @@ add_library(${MODULE} SHARED $) # Linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Public include folders that will be propagated to the dependecies target_include_directories(${MODULE} PUBLIC ${incdirs}) # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TPC/TPCupgrade/CMakeLists.txt b/TPC/TPCupgrade/CMakeLists.txt index bfcd9c29a8e..2c0b91c1b58 100644 --- a/TPC/TPCupgrade/CMakeLists.txt +++ b/TPC/TPCupgrade/CMakeLists.txt @@ -63,7 +63,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TPC/TPCutil/CMakeLists.txt b/TPC/TPCutil/CMakeLists.txt index 381e6bbf859..09938ec0cb6 100644 --- a/TPC/TPCutil/CMakeLists.txt +++ b/TPC/TPCutil/CMakeLists.txt @@ -60,7 +60,7 @@ add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) target_link_libraries(${MODULE} STEERBase STEER ESD CDB RAWDatabase RAWDatarec TPCbase Core Gpad Graf Gui Hist MathCore Matrix RIO Tree) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TPHIC/CMakeLists.txt b/TPHIC/CMakeLists.txt index 75c7d487a6c..12e780f0879 100644 --- a/TPHIC/CMakeLists.txt +++ b/TPHIC/CMakeLists.txt @@ -55,7 +55,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx ${FSRCS}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TRD/DA/CMakeLists.txt b/TRD/DA/CMakeLists.txt index bfb65bae254..123a06bac6a 100644 --- a/TRD/DA/CMakeLists.txt +++ b/TRD/DA/CMakeLists.txt @@ -48,7 +48,7 @@ set(MODULE_COMPILE_FLAGS) set(MODULE_LINK_FLAGS) # different flags -set(MODULE_COMPILE_FLAGS "-O -g ${DATE_CFLAGS} ${AMORE_CFLAGS}") +set(MODULE_COMPILE_FLAGS " ${DATE_CFLAGS} ${AMORE_CFLAGS}") set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${AMORE_STATICLIBS}") set_target_properties(TRDHALFCHAMBERSTATUSda PROPERTIES COMPILE_FLAGS ${MODULE_COMPILE_FLAGS}) # 1 diff --git a/TRD/TRDbase/CMakeLists.txt... b/TRD/TRDbase/CMakeLists.txt... index 35d1cc17ae7..467588cab35 100644 --- a/TRD/TRDbase/CMakeLists.txt... +++ b/TRD/TRDbase/CMakeLists.txt... @@ -159,7 +159,7 @@ target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) target_include_directories(${MODULE} PUBLIC ${incdirs}) # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TRD/TRDcalib/CMakeLists.txt b/TRD/TRDcalib/CMakeLists.txt index 075201085ef..ebb93d6eb49 100644 --- a/TRD/TRDcalib/CMakeLists.txt +++ b/TRD/TRDcalib/CMakeLists.txt @@ -55,7 +55,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TRD/TRDgui/CMakeLists.txt b/TRD/TRDgui/CMakeLists.txt index 746d204c826..3b4d6efcc18 100644 --- a/TRD/TRDgui/CMakeLists.txt +++ b/TRD/TRDgui/CMakeLists.txt @@ -60,7 +60,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TRD/TRDqaAnalysis/CMakeLists.txt b/TRD/TRDqaAnalysis/CMakeLists.txt index b73b2721360..3554babcc4c 100644 --- a/TRD/TRDqaAnalysis/CMakeLists.txt +++ b/TRD/TRDqaAnalysis/CMakeLists.txt @@ -59,7 +59,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TRD/TRDrec/CMakeLists.txt b/TRD/TRDrec/CMakeLists.txt index 978a198c0b4..1731774c8dc 100644 --- a/TRD/TRDrec/CMakeLists.txt +++ b/TRD/TRDrec/CMakeLists.txt @@ -61,16 +61,19 @@ add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) # Follow headers dependencies add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) # Add a library to the project using the object -add_library(${MODULE} SHARED $) +add_library(${MODULE} SHARED $) # Linking -target_link_libraries(${MODULE} RAWDatarec ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) + +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) # Public include folders that will be propagated to the dependecies -#target_include_directories(${MODULE} PUBLIC ${incdirs}) +target_include_directories(${MODULE} PUBLIC ${incdirs}) # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g") +#set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) @@ -81,4 +84,3 @@ endif(${CMAKE_SYSTEM} MATCHES Darwin) install(TARGETS ${MODULE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) - diff --git a/TRD/TRDsim/CMakeLists.txt b/TRD/TRDsim/CMakeLists.txt index ef120fb2c2d..09a18f3329d 100644 --- a/TRD/TRDsim/CMakeLists.txt +++ b/TRD/TRDsim/CMakeLists.txt @@ -84,7 +84,7 @@ target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) target_include_directories(${MODULE} PUBLIC ${incdirs}) # Additional compilation flags -set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TRIGGER/CMakeLists.txt b/TRIGGER/CMakeLists.txt index f9d32ab20cc..7e2812019f3 100644 --- a/TRIGGER/CMakeLists.txt +++ b/TRIGGER/CMakeLists.txt @@ -57,7 +57,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TTherminator/CMakeLists.txt b/TTherminator/CMakeLists.txt index 14b0c41680a..234c5b6ddb6 100644 --- a/TTherminator/CMakeLists.txt +++ b/TTherminator/CMakeLists.txt @@ -63,7 +63,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx ${FSRCS}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/TUHKMgen/CMakeLists.txt b/TUHKMgen/CMakeLists.txt index 015cbbfeb20..a5ee0901cf8 100644 --- a/TUHKMgen/CMakeLists.txt +++ b/TUHKMgen/CMakeLists.txt @@ -71,7 +71,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx ${FSRCS}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/VZERO/DA/CMakeLists.txt b/VZERO/DA/CMakeLists.txt index ab82bb49ec7..a096473d0bc 100644 --- a/VZERO/DA/CMakeLists.txt +++ b/VZERO/DA/CMakeLists.txt @@ -47,7 +47,7 @@ set(MODULE_COMPILE_FLAGS) set(MODULE_LINK_FLAGS) # different flags -set(MODULE_COMPILE_FLAGS "-O -g ${DATE_CFLAGS} ${AMORE_CFLAGS}") +set(MODULE_COMPILE_FLAGS " ${DATE_CFLAGS} ${AMORE_CFLAGS}") set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${AMORE_STATICLIBS}") set_target_properties(VZEROCHANNELDELAYTUNINGda PROPERTIES COMPILE_FLAGS ${MODULE_COMPILE_FLAGS}) # 1 diff --git a/VZERO/VZERObase/CMakeLists.txt b/VZERO/VZERObase/CMakeLists.txt index 15c7fc8ed2e..098e2524f1f 100644 --- a/VZERO/VZERObase/CMakeLists.txt +++ b/VZERO/VZERObase/CMakeLists.txt @@ -76,6 +76,10 @@ add_library(${MODULE} SHARED $) # Linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Public include folders that will be propagated to the dependecies target_include_directories(${MODULE} PUBLIC ${incdirs}) diff --git a/VZERO/VZEROrec/CMakeLists.txt b/VZERO/VZEROrec/CMakeLists.txt index b42e7163fdd..8545d99e7b6 100644 --- a/VZERO/VZEROrec/CMakeLists.txt +++ b/VZERO/VZEROrec/CMakeLists.txt @@ -65,6 +65,10 @@ add_library(${MODULE} SHARED $) # Linking target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) + # Public include folders that will be propagated to the dependecies target_include_directories(${MODULE} PUBLIC ${incdirs}) diff --git a/VZERO/VZEROsim/CMakeLists.txt b/VZERO/VZEROsim/CMakeLists.txt index 52a0d775df9..c4eae2d62e2 100644 --- a/VZERO/VZEROsim/CMakeLists.txt +++ b/VZERO/VZEROsim/CMakeLists.txt @@ -59,7 +59,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/ZDC/CMakeLists.txt b/ZDC/CMakeLists.txt index d3af8ed39ff..dd17c5279c5 100644 --- a/ZDC/CMakeLists.txt +++ b/ZDC/CMakeLists.txt @@ -17,6 +17,10 @@ add_subdirectory(ZDCbase) add_subdirectory(ZDCrec) add_subdirectory(ZDCsim) +if(DA) + add_subdirectory(DA) +endif(DA) + install(FILES GlauberMCDist.root GlauberMCHistos.root diff --git a/ZDC/ZDCbase/CMakeLists.txt b/ZDC/ZDCbase/CMakeLists.txt index 82741b358e3..e9759a95cfb 100644 --- a/ZDC/ZDCbase/CMakeLists.txt +++ b/ZDC/ZDCbase/CMakeLists.txt @@ -56,39 +56,63 @@ string(REPLACE ".cxx" ".h" HDRS "${SRCS}") get_directory_property(incdirs INCLUDE_DIRECTORIES) generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}") +set(ROOT_DEPENDENCIES Core Gpad Graf Hist RIO) +set(ALIROOT_DEPENDENCIES STEERBase STEER CDB ESD RAWDatabase RAWDatarec) + # Generate the ROOT map # Dependecies -set(LIBDEPS STEERBase STEER CDB ESD RAWDatabase RAWDatarec) +set(LIBDEPS ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h") +# Create an object to be reused in case of static libraries +# Otherwise the sources will be compiled twice +add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx) +# Follow headers dependencies +add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES}) +# Add a library to the project using the object +add_library(${MODULE} SHARED $) + +# Linking +target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES}) + +# Setting the correct headers for the object as gathered from the dependencies +target_include_directories(${MODULE}-object PUBLIC $) +set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $) -# Add a library to the project using the specified source files -add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) +# Public include folders that will be propagated to the dependecies +target_include_directories(${MODULE} PUBLIC ${incdirs}) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") endif(${CMAKE_SYSTEM} MATCHES Darwin) -# Check if CRS support was enabled -if(TRD_RAW_CRC) - message(STATUS "CRC support for AliTRDrawStream enabled") - add_definitions(-DTRD_RAW_CRC) -endif(TRD_RAW_CRC) - -# Check if RAW debug enabled -if(TRD_RAW_DEBUG) - message(STATUS "Debug support for AliTRDrawStream enabled") - add_definitions(-DTRD_RAW_DEBUG) -endif(TRD_RAW_DEBUG) - - # Installation 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) + +# Static version if DA enabled +if(ALIROOT_STATIC) + add_library(${MODULE}-static STATIC $) + set_target_properties(${MODULE}-static PROPERTIES OUTPUT_NAME ${MODULE}) + + # list of shared dependencies / the name of the variable containing the list of static ones + generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES") + target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root RootExtra) + + # Public include folders that will be propagated to the dependecies + target_include_directories(${MODULE}-static PUBLIC ${incdirs}) + + set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive") + + # Installation + install(TARGETS ${MODULE}-static + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) +endif(ALIROOT_STATIC) diff --git a/ZDC/ZDCrec/CMakeLists.txt b/ZDC/ZDCrec/CMakeLists.txt index 77ad05b6ccc..cb4c9b49b3f 100644 --- a/ZDC/ZDCrec/CMakeLists.txt +++ b/ZDC/ZDCrec/CMakeLists.txt @@ -58,7 +58,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) diff --git a/ZDC/ZDCsim/CMakeLists.txt b/ZDC/ZDCsim/CMakeLists.txt index 1fde81e2cfe..a6990447a93 100644 --- a/ZDC/ZDCsim/CMakeLists.txt +++ b/ZDC/ZDCsim/CMakeLists.txt @@ -64,7 +64,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE} add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx) # Additional compilation flags -set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g") +set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "") # System dependent: Modify the way the library is build if(${CMAKE_SYSTEM} MATCHES Darwin) -- 2.43.0