diff options
author | Todd Gamblin <tgamblin@llnl.gov> | 2016-02-03 15:41:05 -0700 |
---|---|---|
committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-02-03 15:41:05 -0700 |
commit | 5d1a639afd81a8d47cc74a707b96a44dd772ad2c (patch) | |
tree | f6639bd00b11fb25fcb536154797f74e19eba146 | |
parent | f38851b73d08fbebed90df5112f03f4e2e73229f (diff) | |
parent | e1b3c286ef3817c63b9566d6b64ea330fc739903 (diff) | |
download | spack-5d1a639afd81a8d47cc74a707b96a44dd772ad2c.tar.gz spack-5d1a639afd81a8d47cc74a707b96a44dd772ad2c.tar.bz2 spack-5d1a639afd81a8d47cc74a707b96a44dd772ad2c.tar.xz spack-5d1a639afd81a8d47cc74a707b96a44dd772ad2c.zip |
Merge pull request #424 from adamjstewart/features/cmake
Add url for cmake, simplify url_for_version
-rw-r--r-- | var/spack/repos/builtin/packages/cmake/package.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 408a90460b..e20c1e4aeb 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -23,13 +23,14 @@ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import llnl.util.tty as tty class Cmake(Package): """A cross-platform, open-source build system. CMake is a family of tools designed to build, test and package software.""" homepage = 'https://www.cmake.org' + url = 'https://cmake.org/files/v3.4/cmake-3.4.3.tar.gz' + version('3.4.3', '4cb3ff35b2472aae70f542116d616e63') version('3.4.0', 'cd3034e0a44256a0917e254167217fc8') version('3.3.1', '52638576f4e1e621fed6c3410d3a1b12') version('3.0.2', 'db4c687a31444a929d2fdc36c4dfb95f') @@ -40,12 +41,7 @@ class Cmake(Package): def url_for_version(self, version): """Handle CMake's version-based custom URLs.""" - parts = [str(p) for p in Version(version)] - if len(parts) < 3: - tty.error("Version '%s'does not match CMake's version naming scheme (z.y.x)." % version) - version_short = ".".join(parts[:2]) - version_full = ".".join(parts) - return "http://www.cmake.org/files/v%s/cmake-%s.tar.gz" % (version_short,version_full) + return 'https://cmake.org/files/v%s/cmake-%s.tar.gz' % (version.up_to(2), version) def install(self, spec, prefix): |