summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorThomas Madlener <thomas.madlener@desy.de>2024-06-20 10:31:55 +0200
committerGitHub <noreply@github.com>2024-06-20 02:31:55 -0600
commit84cb604b19e66b14c6d9d4a0fb587f12af4b3a43 (patch)
tree017e25a82bb26151c3f6139e7e9466bc43b191eb /var
parent093504d9a06d0b1215a8f348c433220104d23392 (diff)
downloadspack-84cb604b19e66b14c6d9d4a0fb587f12af4b3a43.tar.gz
spack-84cb604b19e66b14c6d9d4a0fb587f12af4b3a43.tar.bz2
spack-84cb604b19e66b14c6d9d4a0fb587f12af4b3a43.tar.xz
spack-84cb604b19e66b14c6d9d4a0fb587f12af4b3a43.zip
podio: Add version 1.0 (#44780)
Co-authored-by: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com>
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/podio/package.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/podio/package.py b/var/spack/repos/builtin/packages/podio/package.py
index 01a9bf11f1..22ed95c095 100644
--- a/var/spack/repos/builtin/packages/podio/package.py
+++ b/var/spack/repos/builtin/packages/podio/package.py
@@ -20,6 +20,7 @@ class Podio(CMakePackage):
tags = ["hep", "key4hep"]
version("master", branch="master")
+ version("1.0", sha256="491f335e148708e387e90e955a6150e1fc2e01bf6b4980b65e257ab0619559a9")
version("0.99", sha256="c823918a6ec1365d316e0a753feb9d492e28903141dd124a1be06efac7c1877a")
version(
"0.17.4",
@@ -95,6 +96,9 @@ class Podio(CMakePackage):
conflicts("+rntuple", when="@:0.16", msg="rntuple support requires at least podio@0.17")
+ # See https://github.com/AIDASoft/podio/pull/599 that landed after 0.99
+ extends("python", when="@1.0:")
+
def cmake_args(self):
args = [
self.define_from_variant("ENABLE_SIO", "sio"),
@@ -105,7 +109,10 @@ class Podio(CMakePackage):
return args
def setup_run_environment(self, env):
- env.prepend_path("PYTHONPATH", self.prefix.python)
+ if self.spec.satisfies("@:0.99"):
+ # After 0.99 podio installs its python bindings into a more standard place
+ env.prepend_path("PYTHONPATH", self.prefix.python)
+
env.prepend_path("LD_LIBRARY_PATH", self.spec["podio"].libs.directories[0])
if "+sio" in self.spec:
# sio needs to be on LD_LIBRARY_PATH for ROOT to be able to
@@ -116,7 +123,9 @@ class Podio(CMakePackage):
env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.include)
def setup_dependent_build_environment(self, env, dependent_spec):
- env.prepend_path("PYTHONPATH", self.prefix.python)
+ if self.spec.satisfies("@:0.99"):
+ 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)
if self.spec.satisfies("+sio @0.17:"):