diff --git a/spack.yaml b/spack.yaml index 6fd69ca2e7279a6546ed4bfd4d3741f0c434b730..8d86322ab099575187dfe3b14199ebfd9c131d48 100644 --- a/spack.yaml +++ b/spack.yaml @@ -7,7 +7,7 @@ spack: - dawn@3_91a - dawncut@1_54a - dd4hep@1.20.1 +geant4 -assimp +hepmc3 +ipo +lcio - - edm4hep@0.4 cxxstd=17 -ipo + - edm4hep@0.4.1 cxxstd=17 -ipo - eigen@3.4.0 - emacs@27.2 toolkit=athena - fastjet@3.3.3 @@ -25,7 +25,7 @@ spack: - nlohmann-json@3.10.4 - opencascade@7.5.3 - pkg-config@0.29.2 - - podio@0.14 build_type=RelWithDebInfo + - podio@0.14.1 build_type=RelWithDebInfo - pythia8@8.306 +fastjet - python@3.9.7 - py-numpy@1.21.3 diff --git a/spack/packages/edm4hep/package.py b/spack/packages/edm4hep/package.py new file mode 100644 index 0000000000000000000000000000000000000000..f1157d61401e062c7f8f295014a676acf5520c97 --- /dev/null +++ b/spack/packages/edm4hep/package.py @@ -0,0 +1,7 @@ +from spack import * +from spack.pkg.builtin.edm4hep import Edm4hep as BuiltinEdm4hep + + +class Edm4hep(BuiltinEdm4hep): + version('0.4.1', sha256='122987fd5969b0f1639afa9668ac5181203746d00617ddb3bf8a2a9842758a63') + version('0.4', sha256='bcb729cd4a6f5917b8f073364fc950788111e178dd16b7e5218361f459c92a24') diff --git a/spack/packages/podio/package.py b/spack/packages/podio/package.py index 9ef10593d6de0738220bd7648bbcbff86b4df628..0660516a598703e6bb03670f80d7c9b657f014e7 100644 --- a/spack/packages/podio/package.py +++ b/spack/packages/podio/package.py @@ -5,4 +5,15 @@ from spack.pkg.builtin.podio import Podio as BuiltinPodio class Podio(BuiltinPodio): # issue with build breaking for spack as the search-and-replace for "root" # erroneously selects the all files as the build happens under /tmp/root - patch('cmake.patch', when="@0.13.1:0.14") + patch('cmake.patch', when="@0.13.1:0.14.0") + + version('0.14.1', sha256='361ac3f3ec6f5a4830729ab45f96c19f0f62e9415ff681f7c6cdb4ebdb796f72') + + def setup_run_environment(self, env): + env.prepend_path('PYTHONPATH', self.prefix.python) + env.prepend_path('LD_LIBRARY_PATH', self.spec['podio'].libs.directories[0]) + + def setup_dependent_build_environment(self, env, dependent_spec): + env.prepend_path('PYTHONPATH', self.prefix.python) + env.prepend_path('LD_LIBRARY_PATH', self.spec['podio'].libs.directories[0]) + env.prepend_path('ROOT_INCLUDE_PATH', self.prefix.include)