diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-02-03 14:24:59 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-02-03 14:24:59 -0700 |
| commit | f38851b73d08fbebed90df5112f03f4e2e73229f (patch) | |
| tree | 7b8d89d036a0a572d1ad8ca8adb4dcc727e0c09d /var | |
| parent | b6434d9581b8beb2457504c008dca5a035cce182 (diff) | |
| parent | 8821715377147ae017d428d8c1216576de0b79e1 (diff) | |
| download | spack-f38851b73d08fbebed90df5112f03f4e2e73229f.tar.gz spack-f38851b73d08fbebed90df5112f03f4e2e73229f.tar.bz2 spack-f38851b73d08fbebed90df5112f03f4e2e73229f.tar.xz spack-f38851b73d08fbebed90df5112f03f4e2e73229f.zip | |
Merge remote-tracking branch 'github/pull/99' into develop
Conflicts:
var/spack/repos/builtin/packages/cmake/package.py
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/cmake/package.py | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index f67ae21ebd..408a90460b 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -23,25 +23,31 @@ # 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' - version('2.8.10.2', '097278785da7182ec0aea8769d06860c', - url = 'http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz') - - version('3.0.2', 'db4c687a31444a929d2fdc36c4dfb95f', - url = 'http://www.cmake.org/files/v3.0/cmake-3.0.2.tar.gz') - - version('3.4.0', 'cd3034e0a44256a0917e254167217fc8', - url = 'http://cmake.org/files/v3.4/cmake-3.4.0.tar.gz') + version('3.4.0', 'cd3034e0a44256a0917e254167217fc8') + version('3.3.1', '52638576f4e1e621fed6c3410d3a1b12') + version('3.0.2', 'db4c687a31444a929d2fdc36c4dfb95f') + version('2.8.10.2', '097278785da7182ec0aea8769d06860c') variant('ncurses', default=True, description='Enables the build of the ncurses gui') - depends_on('ncurses', when='+ncurses') + 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) + + def install(self, spec, prefix): configure('--prefix=' + prefix, '--parallel=' + str(make_jobs), |