From 411ea019f1b3fba51936fcb64978a0aa8ec7f624 Mon Sep 17 00:00:00 2001 From: Miroslav Stoyanov <30537612+mkstoyanov@users.noreply.github.com> Date: Sat, 19 Oct 2024 11:12:41 -0400 Subject: heffte: Update @develop for newer cmake (#47067) --- var/spack/repos/builtin/packages/heffte/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/heffte/package.py b/var/spack/repos/builtin/packages/heffte/package.py index 7ad6c88043..9496e1e23a 100644 --- a/var/spack/repos/builtin/packages/heffte/package.py +++ b/var/spack/repos/builtin/packages/heffte/package.py @@ -142,7 +142,12 @@ class Heffte(CMakePackage, CudaPackage, ROCmPackage): cmake_dir = self.test_suite.current_test_cache_dir.testing options = [cmake_dir] - options.append(self.define("Heffte_DIR", self.spec.prefix.lib.cmake.Heffte)) + # changing the default install path search to newer cmake convention + if self.spec.satisfies("@develop"): + options.append(self.define("Heffte_ROOT", self.spec.prefix)) + else: + options.append(self.define("Heffte_DIR", self.spec.prefix.lib.cmake.Heffte)) + if self.spec.satisfies("+rocm"): # path name is 'hsa-runtime64' but python cannot have '-' in variable name hsa_runtime = join_path(self.spec["hsa-rocr-dev"].prefix.lib.cmake, "hsa-runtime64") -- cgit v1.2.3-70-g09d2