From 7a023b11b9c59676157426f3430374312222aa70 Mon Sep 17 00:00:00 2001 From: Alex Chapman Date: Fri, 19 Jul 2024 14:33:52 -0700 Subject: [PATCH] Don't propagate +shared to umpire if +cuda --- scripts/spack/packages/serac/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/spack/packages/serac/package.py b/scripts/spack/packages/serac/package.py index 3fca1d0cf..ba2eacada 100644 --- a/scripts/spack/packages/serac/package.py +++ b/scripts/spack/packages/serac/package.py @@ -162,10 +162,15 @@ class Serac(CachedCMakePackage, CudaPackage): # CMake packages "build_type=RelWithDebInfo|Debug|Release|MinSizeRel" # Optional (require our variant in "when") - for dep in ["raja", "umpire", "strumpack"]: + for dep in ["raja", "strumpack"]: depends_on("{0} build_type=Debug".format(dep), when="+{0} build_type=Debug".format(dep)) depends_on("{0}+shared".format(dep), when="+{0}+shared".format(dep)) depends_on("{0}~shared".format(dep), when="+{0}~shared".format(dep)) + + # Only propagate shared if not CUDA + depends_on("umpire build_type=Debug".format(dep), when="+umpire build_type=Debug".format(dep)) + depends_on("umpire+shared".format(dep), when="+umpire+shared~cuda".format(dep)) + depends_on("umpire~shared".format(dep), when="+umpire~shared".format(dep)) # Don't add propagate shared variant to sundials depends_on("sundials build_type=Debug".format(dep), when="+sundials build_type=Debug".format(dep))