From b84b85a7e067e66928768d676da0c86aa07e4c81 Mon Sep 17 00:00:00 2001 From: snehring <7978778+snehring@users.noreply.github.com> Date: Fri, 8 Mar 2024 12:09:35 -0600 Subject: visit: link against hip when built with vtk-m+rocm (#42452) --- var/spack/repos/builtin/packages/visit/package.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/visit/package.py b/var/spack/repos/builtin/packages/visit/package.py index ca78eff6bf..3f806196fd 100644 --- a/var/spack/repos/builtin/packages/visit/package.py +++ b/var/spack/repos/builtin/packages/visit/package.py @@ -356,23 +356,23 @@ class Visit(CMakePackage): args.append(self.define("VISIT_VTKH_DIR", spec["vtk-h"].prefix)) if "@3.3.3: +vtkm" in spec: + lib_dirs = [spec["libx11"].prefix.lib] + if self.spec.satisfies("^vtkm+rocm"): + lib_dirs.append(spec["hip"].prefix.lib) args.append(self.define("VISIT_VTKM_DIR", spec["vtk-m"].prefix)) args.append( self.define( - "CMAKE_EXE_LINKER_FLAGS", - "-L%s/lib -L%s/lib" % (spec["hip"].prefix, spec["libx11"].prefix), + "CMAKE_EXE_LINKER_FLAGS", "".join("-L%s " % s for s in lib_dirs).strip() ) ) args.append( self.define( - "CMAKE_MODULE_LINKER_FLAGS", - "-L%s/lib -L%s/lib" % (spec["hip"].prefix, spec["libx11"].prefix), + "CMAKE_MODULE_LINKER_FLAGS", "".join("-L%s " % s for s in lib_dirs).strip() ) ) args.append( self.define( - "CMAKE_SHARED_LINKER_FLAGS", - "-L%s/lib -L%s/lib" % (spec["hip"].prefix, spec["libx11"].prefix), + "CMAKE_SHARED_LINKER_FLAGS", "".join("-L%s " % s for s in lib_dirs).strip() ) ) -- cgit v1.2.3-70-g09d2