From e2329adac04e5ae6a9e51adfcee201bf65a46477 Mon Sep 17 00:00:00 2001 From: Frank Willmore Date: Sat, 4 May 2024 02:06:15 +0800 Subject: [PATCH] Update package.py for vacuumms 1.2.0 (#43948) * updating vacuumms for new release * formatting * re-order versions and remove triple quote --- .../builtin/packages/vacuumms/package.py | 39 ++++++++++++++++--- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/var/spack/repos/builtin/packages/vacuumms/package.py b/var/spack/repos/builtin/packages/vacuumms/package.py index 96b07689e6..6b3bf03716 100644 --- a/var/spack/repos/builtin/packages/vacuumms/package.py +++ b/var/spack/repos/builtin/packages/vacuumms/package.py @@ -16,25 +16,48 @@ class Vacuumms(CMakePackage): under Linux on x86_64 and ARM64. Please submit questions, pull requests, and bug reports via github. https://dl.acm.org/doi/abs/10.1145/2335755.2335826""" - homepage = "https://github.com/frankwillmore/VACUUMMS" - url = "https://github.com/frankwillmore/VACUUMMS/archive/refs/tags/v1.0.0.tar.gz" - git = "https://github.com/frankwillmore/VACUUMMS.git" + homepage = "https://github.com/VACUUMMS/VACUUMMS" + url = "https://github.com/VACUUMMS/VACUUMMS/archive/refs/tags/v1.0.0.tar.gz" + git = "https://github.com/VACUUMMS/VACUUMMS.git" maintainers("frankwillmore") - license("Unlicense") + license("MIT") - version("master", branch="master") - version("1.1.1", tag="v1.1.1", commit="a395930c87f5b52ab0ab8db278bd2bde592e8f12") + # This is the main branch, for the latest functionality + version("develop", branch="develop") + + version( + "1.2.0", + sha256="1836e6c29d1e83a79f9c6a9b686d1419bd72618aba7c46d3d038373808519d56", + preferred=True, + deprecated=False, + ) + version( + "1.1.4", + sha256="13052bafca8622df5f14613b3d4cddd50bae725e0c13c1df7f3cdee28a2e673a", + deprecated=False, + ) version( "1.0.0", sha256="c18fe52f5041880da7f50d3808d37afb3e9c936a56f80f67838d045bf7af372f", deprecated=True, ) + variant("test", default=True, description="enable CMake testing") variant("tiff", default=False, description="Build TIFF utilities") variant("cuda", default=False, description="Build CUDA applications and utilities") + variant("variational", default=False, description="Build VARIATIONAL module") + variant("voronoi", default=False, description="Build VORONOI applications and utilities") + variant( + "VOROPP_HOME", + default="/opt/voropp", + description="voro++ location", + multi=False, + when="+voronoi", + ) + depends_on("voropp", type=("link", "run"), when="+voronoi") depends_on("libtiff", type=("link", "run"), when="+tiff") depends_on("cuda", type=("link", "run"), when="+cuda") depends_on("libx11", type=("link", "run")) @@ -44,6 +67,10 @@ class Vacuumms(CMakePackage): def cmake_args(self): return [ + self.define_from_variant("ENABLE_TESTING", "test"), self.define_from_variant("BUILD_CUDA_COMPONENTS", "cuda"), self.define_from_variant("BUILD_TIFF_UTILS", "tiff"), + self.define_from_variant("BUILD_VARIATIONAL_MODULE", "variational"), + self.define_from_variant("BUILD_VORONOI_UTILS", "voronoi"), + self.define_from_variant("VOROPP_HOME", "VOROPP_HOME"), ]