diff --git a/ilcsoft/dd4hep.py b/ilcsoft/dd4hep.py index cd0f7fae..023fe567 100644 --- a/ilcsoft/dd4hep.py +++ b/ilcsoft/dd4hep.py @@ -26,10 +26,13 @@ def __init__(self, userInput): self.download.gituser = 'AIDASoft' self.download.gitrepo = 'DD4hep' - self.reqfiles = [ ["lib/libDDCore.so", "lib/libDDCore.dylib" ]] + self.reqfiles = [ ["lib/libDDCore.so", "lib/libDDCore.dylib" ], + ["lib/libSimpleDetector.so", "lib/libSimpleDetector.dylib" ]] self.reqmodules = [ "ROOT" , "LCIO", "GEAR", "Geant4" , "CLHEP" ,"Boost" , "EDM4hep" ] + self.envcmake["DD4HEP_BUILD_EXAMPLES"] = "ON" + def setMode(self, mode): BaseILC.setMode(self, mode) @@ -75,5 +78,7 @@ def postCheckDeps(self): self.env[ 'DD4HEP' ] = self.installPath self.env[ 'DD4HEP_ENVINIT' ] = "${DD4HEP}/bin/thisdd4hep.sh" self.envcmds.append('test -r ${DD4HEP_ENVINIT} && . ${DD4HEP_ENVINIT}') - - + + # The other parts of the environment for the examples are already part of + # the DD4hep environment, since artifacts go into the same directories + self.env["DD4hepExamples"] = self.installPath + "/examples" diff --git a/ilcsoft/dd4hep_examples.py b/ilcsoft/dd4hep_examples.py index d0cad8db..f7a993ea 100644 --- a/ilcsoft/dd4hep_examples.py +++ b/ilcsoft/dd4hep_examples.py @@ -7,6 +7,8 @@ # ################################################## +import warnings + # custom imports from .baseilc import BaseILC from .util import * @@ -16,6 +18,7 @@ class DD4hepExamples(BaseILC): """ Responsible for the DD4hepExamples configuration process. """ def __init__(self, userInput): + warnings.warn("The examples are now built as part of DD4hep", DeprecationWarning, stacklevel=2) BaseILC.__init__(self, userInput, "DD4hepExamples", "DD4hepExamples") #self.hasCMakeBuildSupport = False diff --git a/releases/v02-03/release-ilcsoft.cfg b/releases/v02-03/release-ilcsoft.cfg index 4204f31d..b0a639ac 100644 --- a/releases/v02-03/release-ilcsoft.cfg +++ b/releases/v02-03/release-ilcsoft.cfg @@ -260,8 +260,6 @@ ilcsoft.module("aidaTT").download.gitrepo="aidaTT" ilcsoft.install( DDKalTest( DDKalTest_version )) -ilcsoft.install( DD4hepExamples ( DD4hepExamples_version )) - #################################################################### # # the following tools are installed in afs: