diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2017-05-09 17:19:06 -0400 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-05-09 16:19:06 -0500 |
| commit | 0e02f993238712220f3925629f4698adfe03a52e (patch) | |
| tree | bae784d39b1e5f12c5c041c066c9dc466e409887 /var | |
| parent | 68034e4d428776ac3fb3fcfa4ee8a53b4f5714a6 (diff) | |
| download | spack-0e02f993238712220f3925629f4698adfe03a52e.tar.gz spack-0e02f993238712220f3925629f4698adfe03a52e.tar.bz2 spack-0e02f993238712220f3925629f4698adfe03a52e.tar.xz spack-0e02f993238712220f3925629f4698adfe03a52e.zip | |
funhpc: Update to version 1.3 (#4170)
Also use a Spack-provided GoogleTest.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/funhpc/package.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/funhpc/package.py b/var/spack/repos/builtin/packages/funhpc/package.py index 03120d07ba..d676e97810 100644 --- a/var/spack/repos/builtin/packages/funhpc/package.py +++ b/var/spack/repos/builtin/packages/funhpc/package.py @@ -23,7 +23,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## - from spack import * @@ -32,6 +31,8 @@ class Funhpc(CMakePackage): homepage = "https://github.com/eschnett/FunHPC.cxx" url = "https://github.com/eschnett/FunHPC.cxx/archive/version/0.1.0.tar.gz" + version('1.3.0', '71a1e57c4d882cdf001f29122edf7fc6') + version('1.2.0', 'ba2bbeea3091e999b6b85eaeb1b67a83') version('1.1.1', '7b9ef638b02fffe35b75517e8eeff580') version('1.1.0', '897bd968c42cd4f14f86fcf67da70444') version('1.0.0', 'f34e71ccd5548b42672e692c913ba5ee') @@ -44,6 +45,7 @@ class Funhpc(CMakePackage): description="Produce position-independent code") depends_on('cereal') + depends_on('googletest') depends_on('hwloc') depends_on('jemalloc') depends_on('mpi') @@ -51,9 +53,9 @@ class Funhpc(CMakePackage): def cmake_args(self): spec = self.spec - options = [] + options = ["-DGTEST_ROOT=%s" % spec['googletest'].prefix] if '+pic' in spec: - options.extend(["-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true"]) + options += ["-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true"] return options def check(self): |