diff options
| author | Marie Houillon <houillonmarie@gmail.com> | 2023-01-17 10:31:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-17 10:31:15 +0100 |
| commit | 100134a2b1c58f80e389b4141588e9aee3ea25fd (patch) | |
| tree | f784d0439c423da5d060554334a902739010c51f | |
| parent | 39ffef83631463e4e0c546d57a8602199ef13aa2 (diff) | |
| download | spack-100134a2b1c58f80e389b4141588e9aee3ea25fd.tar.gz spack-100134a2b1c58f80e389b4141588e9aee3ea25fd.tar.bz2 spack-100134a2b1c58f80e389b4141588e9aee3ea25fd.tar.xz spack-100134a2b1c58f80e389b4141588e9aee3ea25fd.zip | |
New version for openCARP packages, v12.0 (#34710)
Co-authored-by: openCARP consortium <info@opencarp.org>
| -rw-r--r-- | var/spack/repos/builtin/packages/meshtool/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/opencarp/package.py | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-carputils/package.py | 1 |
3 files changed, 12 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/meshtool/package.py b/var/spack/repos/builtin/packages/meshtool/package.py index 650925e16c..09683f4b25 100644 --- a/var/spack/repos/builtin/packages/meshtool/package.py +++ b/var/spack/repos/builtin/packages/meshtool/package.py @@ -16,6 +16,7 @@ class Meshtool(MakefilePackage): version("master", branch="master", preferred=True) # Version to use with openCARP releases + version("oc12.0", commit="867431d") version("oc11.0", commit="867431d") version("oc10.0", commit="6c5cfbd067120901f15a04bf63beec409bda6dc9") version("oc9.0", commit="6c5cfbd067120901f15a04bf63beec409bda6dc9") diff --git a/var/spack/repos/builtin/packages/opencarp/package.py b/var/spack/repos/builtin/packages/opencarp/package.py index c2a07248ec..d0304d3f9d 100644 --- a/var/spack/repos/builtin/packages/opencarp/package.py +++ b/var/spack/repos/builtin/packages/opencarp/package.py @@ -18,7 +18,8 @@ class Opencarp(CMakePackage): maintainers = ["MarieHouillon"] - version("11.0", commit="fd8419d5", submodules=False, no_cache=True, preferred=True) + version("12.0", commit="a34c11af", submodules=False, no_cache=True, preferred=True) + version("11.0", commit="fd8419d5", submodules=False, no_cache=True) version("10.0", commit="7aec7900", submodules=False, no_cache=True) version("9.0", commit="c0167599", submodules=False, no_cache=True) version("8.2", commit="dbfd16fd", submodules=False, no_cache=True) @@ -29,6 +30,13 @@ class Opencarp(CMakePackage): variant("carputils", default=False, description="Installs the carputils framework") variant("meshtool", default=False, description="Installs the meshtool software") + variant( + "build_type", + default="Release", + description="CMake build type", + values=("Debug", "Release", "RelWithDebInfo", "MinSizeRel"), + ) + # Patch removing problematic steps in CMake process patch("opencarp7.patch", when="@7.0") @@ -44,7 +52,7 @@ class Opencarp(CMakePackage): depends_on("py-carputils", when="+carputils") depends_on("meshtool", when="+meshtool") # Use specific versions of carputils and meshtool for releases - for ver in ["11.0", "10.0", "9.0", "8.2", "7.0", "8.1"]: + for ver in ["12.0", "11.0", "10.0", "9.0", "8.2", "7.0", "8.1"]: depends_on("py-carputils@oc" + ver, when="@" + ver + " +carputils") depends_on("meshtool@oc" + ver, when="@" + ver + " +meshtool") diff --git a/var/spack/repos/builtin/packages/py-carputils/package.py b/var/spack/repos/builtin/packages/py-carputils/package.py index aec6da867b..27cac6b78b 100644 --- a/var/spack/repos/builtin/packages/py-carputils/package.py +++ b/var/spack/repos/builtin/packages/py-carputils/package.py @@ -17,6 +17,7 @@ class PyCarputils(PythonPackage): version("master", branch="master") # Version to use with openCARP releases + version("oc12.0", commit="4d7a1f0c604a2ad232e70cf9aa3a8daff5ffb195") version("oc11.0", commit="a02f9b846c6e852b7315b20e925d55c355f239b8") version("oc10.0", commit="a02f9b846c6e852b7315b20e925d55c355f239b8") version("oc9.0", commit="e79e66b25c7bfaf405fad595019594ab9aa83392") |