diff --git a/examples/macbookfg/release-base.cfg b/examples/macbookfg/release-base.cfg index 4dc9feaf..3b0f0b17 100644 --- a/examples/macbookfg/release-base.cfg +++ b/examples/macbookfg/release-base.cfg @@ -119,7 +119,7 @@ geant4.envcmake["GEANT4_USE_SYSTEM_CLHEP"]='ON' geant4.envcmake["GEANT4_USE_OPENGL_X11"]='ON' geant4.envcmake["GEANT4_USE_QT"]='ON' # requires qt geant4.envcmake["GEANT4_BUILD_TLS_MODEL"]= 'global-dynamic' -geant4.envcmake["GEANT4_BUILD_CXXSTD"]='c++' + str(cxx_standard) +geant4.envcmake["GEANT4_BUILD_CXXSTD"]= str(cxx_standard) geant4.envcmake["GEANT4_INSTALL_DATA_TIMEOUT"]='7200' geant4.envcmake["QT_QMAKE_EXECUTABLE"]='/usr/local/opt/qt/bin/qmake' ##'/usr/local/bin/qmake' # requires qt geant4.envcmake["CMAKE_PREFIX_PATH"]='/usr/local/opt/qt5' diff --git a/examples/macbookfg/release-ilcsoft.cfg b/examples/macbookfg/release-ilcsoft.cfg index 6c2f3db2..c50eec5c 100644 --- a/examples/macbookfg/release-ilcsoft.cfg +++ b/examples/macbookfg/release-ilcsoft.cfg @@ -26,7 +26,7 @@ path_where_this_file_lives = os.path.dirname( config_file ) versions_file = os.path.join( path_where_this_file_lives, "release-versions.py" ) exec(compile(open(versions_file, "rb").read(), versions_file, "exec")) -print "Do we install nightlies? ", nightlies +#print "Do we install nightlies? ", nightlies # installation directory if not 'ilcsoft_install_dir' in dir(): @@ -108,7 +108,7 @@ ilcsoft.module("DDMarlinPandora").envcmake["CMAKE_CXX_FLAGS"]='-Wno-error' ilcsoft.install( MarlinUtil( MarlinUtil_version )) - +ilcsoft.module("MarlinUtil").envcmake["USE_EXTERNAL_CATCH2"] = 'OFF' #---------- standard reco packages @@ -152,7 +152,7 @@ ilcsoft.install( MarlinPKG( "MarlinTrkProcessors", MarlinTrkProcessors_version ) ilcsoft.module("MarlinTrkProcessors").addDependency( [ 'LCIO', 'ROOT', 'GSL', 'Marlin', 'MarlinUtil', 'KalTest', 'KalDet', 'MarlinTrk', 'KiTrack', 'KiTrackMarlin'] ) ilcsoft.install( MarlinPKG( "MarlinKinfitProcessors", MarlinKinfitProcessors_version )) -ilcsoft.module("MarlinKinfitProcessors").addDependency( [ 'LCIO', 'GEAR', 'GSL', 'Marlin'] ) +ilcsoft.module("MarlinKinfitProcessors").addDependency( [ 'LCIO', 'GEAR', 'GSL', 'Marlin','Boost'] ) ilcsoft.install( MarlinPKG( "ILDPerformance", ILDPerformance_version )) ilcsoft.module("ILDPerformance").addDependency( [ 'Marlin', 'MarlinUtil', 'ROOT'] ) @@ -242,7 +242,10 @@ ilcsoft.module("DD4hep").envcmake["DD4HEP_USE_LCIO"]=1 ilcsoft.module("DD4hep").envcmake["DD4HEP_USE_XERCESC"]=0 ilcsoft.module("DD4hep").envcmake["DD4HEP_USE_PYROOT"]=0 ilcsoft.module("DD4hep").envcmake["DD4HEP_USE_GEAR"]=1 +ilcsoft.module("DD4hep").envcmake["DD4HEP_RELAX_PYVER"]='ON' ilcsoft.module("DD4hep").envcmake["BUILD_DOCS"]=0 +ilcsoft.module("DD4hep").envcmake["DD4HEP_USE_EDM4HEP"]='ON' + ## hack to use the correct python3 #ilcsoft.module("DD4hep").envcmake["PYTHON_INCLUDE_DIR"]="/usr/local/Cellar/python@3.9/3.9.0_1/Frameworks/Python.framework/Versions/3.9/include/python3.9" #ilcsoft.module("DD4hep").envcmake["PYTHON_LIBRARY"]="/usr/local/opt/python@3.9/Frameworks/Python.framework/Versions/3.9/lib/libpython3.9.dylib" @@ -252,9 +255,12 @@ ilcsoft.install( lcgeo( lcgeo_version )) ilcsoft.install( podio( podio_version )) ilcsoft.module("podio").envcmake["ENABLE_SIO"] = 'ON' +ilcsoft.module("podio").envcmake["USE_EXTERNAL_CATCH2"] = 'OFF' +ilcsoft.module("podio").envcmake["PODIO_RELAX_PYVER"] = 'ON' ilcsoft.install( edm4hep( edm4hep_version )) ilcsoft.module("edm4hep").envcmake["BUILD_DDG4EDM4HEP"] = 'OFF' +ilcsoft.module("edm4hep").envcmake["USE_EXTERNAL_CATCH2"] = 'OFF' ilcsoft.install( aidaTT( aidaTT_version )) ##ilcsoft.module("aidaTT").download.type="GitHub" diff --git a/examples/macbookfg/release-versions.py b/examples/macbookfg/release-versions.py index f5033499..54423272 100644 --- a/examples/macbookfg/release-versions.py +++ b/examples/macbookfg/release-versions.py @@ -106,22 +106,35 @@ # ======================= PACKAGE VERSIONS =================================== +##Geant4_version = "10.06.p02" +##CLHEP_version = "2.4.1.3" #"2.3.4.3" +##ROOT_version = "6.22.02" +##GSL_version = "2.6" #"2.1" # "1.15" +##Qt5_version = "v5.13.1" +##CMake_version = "3.17.3" ##"3.15.2" #"3.4.3" #"2.8.5" +##SIO_version = "v00-00-03" +Eigen_version = "3.3.7" +##Boost_version = "1.71.0" + +Geant4_version = "11.0.2" + +CLHEP_version = "2.4.5.3" -Geant4_version = "10.06.p02" -CLHEP_version = "2.4.1.3" #"2.3.4.3" -ROOT_version = "6.22.02" +ROOT_version = "6.26.06" -GSL_version = "2.6" #"2.1" # "1.15" +GSL_version = "2.7" Qt5_version = "v5.13.1" -CMake_version = "3.17.3" ##"3.15.2" #"3.4.3" #"2.8.5" +CMake_version = "3.23.2" -SIO_version = "v00-00-03" +CED_version = "v01-09-04" -Eigen_version = "3.3.7" +SIO_version = "v00-01" + +Boost_version = "1.77.0" -Boost_version = "1.71.0" +#Eigen_version = "3.4.0" # ------------------------------------------- @@ -136,8 +149,10 @@ ILCUTIL_version = "HEAD" # "v01-02-01" -FastJet_version = "3.3.3" -FastJetcontrib_version = "1.044" +##FastJet_version = "3.3.3" +##FastJetcontrib_version = "1.044" +FastJet_version = "3.4.0" +FastJetcontrib_version = "1.049" FastJetClustering_version = "HEAD" # "v00-02" @@ -227,7 +242,7 @@ ## xerces-c (needed by geant4 for building gdml support # -XercesC_version = "v3.2.2" +XercesC_version = "v3.2.3" XERCESC_ROOT_DIR = ilcPath + "/xercesc/" + XercesC_version DD4hep_version = "HEAD" # "v00-12" diff --git a/ilcsoft/dd4hep.py b/ilcsoft/dd4hep.py index bd9d7925..cd0f7fae 100644 --- a/ilcsoft/dd4hep.py +++ b/ilcsoft/dd4hep.py @@ -28,7 +28,7 @@ def __init__(self, userInput): self.reqfiles = [ ["lib/libDDCore.so", "lib/libDDCore.dylib" ]] - self.reqmodules = [ "ROOT" , "LCIO", "GEAR", "Geant4" , "CLHEP" ,"Boost" ] + self.reqmodules = [ "ROOT" , "LCIO", "GEAR", "Geant4" , "CLHEP" ,"Boost" , "EDM4hep" ] def setMode(self, mode):