summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Duckworth <quackmaster@protonmail.com>2019-11-05 13:40:27 -0500
committerAdam J. Stewart <ajstewart426@gmail.com>2019-11-05 12:40:27 -0600
commit54e1d576479ca2137f92ddcc2060415c6cc34b86 (patch)
tree9ea276625011b91485e63d5d48c16bcafdfa2b66
parenta6ccb5b2fa8861c911f9580f213be4a62087b383 (diff)
downloadspack-54e1d576479ca2137f92ddcc2060415c6cc34b86.tar.gz
spack-54e1d576479ca2137f92ddcc2060415c6cc34b86.tar.bz2
spack-54e1d576479ca2137f92ddcc2060415c6cc34b86.tar.xz
spack-54e1d576479ca2137f92ddcc2060415c6cc34b86.zip
added relion 3.0.8 [latest stable version in 3.0 branch] as well as 3.1_beta (#13539)
* added relion 3.0.8 [latest stable version in 3.0 branch] as well as 3.1_beta * relion 3.1 beta compiles without Benchmarking build type see https://github.com/3dem/relion/issues/533 * relion 3.0.X - 3.1 now supports latest cmake@3
-rw-r--r--var/spack/repos/builtin/packages/relion/package.py18
1 files changed, 12 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/relion/package.py b/var/spack/repos/builtin/packages/relion/package.py
index a9ab80b849..0629cd4aa3 100644
--- a/var/spack/repos/builtin/packages/relion/package.py
+++ b/var/spack/repos/builtin/packages/relion/package.py
@@ -15,10 +15,18 @@ class Relion(CMakePackage, CudaPackage):
homepage = "http://http://www2.mrc-lmb.cam.ac.uk/relion"
git = "https://github.com/3dem/relion.git"
+ # 3.1 is beta but referenced in published papers
+ # prefer stable 3.0 until no longer beta
+ version('3.1_beta', branch='ver3.1')
+
+ # 3.0.8 latest release in 3.0 branch
+ # prefer for now
+ version('3.0.8', tag='3.0.8', preferred=True)
version('3.0.7', tag='3.0.7')
- # relion has no develop branch though pulling from master
- # should be considered the same as develop
- version('develop', branch='master')
+
+ # relion master contains development code
+ # contains 3.0 branch code
+ version('master')
variant('gui', default=True, description="build the gui")
variant('cuda', default=True, description="enable compute on gpu")
@@ -34,9 +42,7 @@ class Relion(CMakePackage, CudaPackage):
'Profiling', 'Benchmarking'))
depends_on('mpi')
- # relion will not build with newer versions of cmake
- # per https://github.com/3dem/relion/issues/380
- depends_on('cmake@3:3.9.4', type='build')
+ depends_on('cmake@3:', type='build')
depends_on('fftw precision=float,double')
depends_on('fltk', when='+gui')
depends_on('libtiff')