summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Stoyanov <30537612+mkstoyanov@users.noreply.github.com>2024-10-19 11:12:41 -0400
committerGitHub <noreply@github.com>2024-10-19 17:12:41 +0200
commit411ea019f1b3fba51936fcb64978a0aa8ec7f624 (patch)
tree3055145aed7e3d88bd160ae429f69b654c87136f
parent296f99d8003f748b64bff9906f8a0b29963a53a1 (diff)
downloadspack-411ea019f1b3fba51936fcb64978a0aa8ec7f624.tar.gz
spack-411ea019f1b3fba51936fcb64978a0aa8ec7f624.tar.bz2
spack-411ea019f1b3fba51936fcb64978a0aa8ec7f624.tar.xz
spack-411ea019f1b3fba51936fcb64978a0aa8ec7f624.zip
heffte: Update @develop for newer cmake (#47067)
-rw-r--r--var/spack/repos/builtin/packages/heffte/package.py7
1 files changed, 6 insertions, 1 deletions
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")