diff options
| author | Andrew Gaspar <andrew.gaspar@outlook.com> | 2018-05-08 12:04:19 -0600 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-05-08 13:04:19 -0500 |
| commit | 29b11f624fb9da4309611d5add76dc030c185d96 (patch) | |
| tree | d2a3dfe0a5a90bbf78327e947728cd4ebc1439ed | |
| parent | bb5ef39ad2a1e23874374b4a45c57939358c027a (diff) | |
| download | spack-29b11f624fb9da4309611d5add76dc030c185d96.tar.gz spack-29b11f624fb9da4309611d5add76dc030c185d96.tar.bz2 spack-29b11f624fb9da4309611d5add76dc030c185d96.tar.xz spack-29b11f624fb9da4309611d5add76dc030c185d96.zip | |
Updates to Google Benchmark package: (#8056)
- Adds v1.3.0 and v1.4.0
- List explicit CMake version dependency (from Benchmark CMake files)
- Disable the building of tests. Starting in v1.4.0 this introduced a dependency on GoogleTest
Tested by building all versions on macOS High Sierra
| -rw-r--r-- | var/spack/repos/builtin/packages/benchmark/package.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/benchmark/package.py b/var/spack/repos/builtin/packages/benchmark/package.py index 6099a6e866..98a309aeb3 100644 --- a/var/spack/repos/builtin/packages/benchmark/package.py +++ b/var/spack/repos/builtin/packages/benchmark/package.py @@ -36,6 +36,8 @@ class Benchmark(CMakePackage): # first properly installed CMake config packages in # 1.2.0 release: https://github.com/google/benchmark/issues/363 + version('1.4.0', 'ccfaf2cd93ae20191b94f730b945423e') + version('1.3.0', '19ce86516ab82d6ad3b17173cf307aac') version('1.2.0', '48d0b090cd7a84af2c4a28c8dc963c74') version('1.1.0', '66b2a23076cf70739525be0092fc3ae3') version('1.0.0', '1474ff826f8cd68067258db75a0835b8') @@ -45,6 +47,14 @@ class Benchmark(CMakePackage): values=('Debug', 'Release', 'RelWithDebInfo', 'MinSizeRel', 'Coverage')) + depends_on("cmake@2.8.11:", type="build", when="@:1.1.0") + depends_on("cmake@2.8.12:", type="build", when="@1.2.0:") + + def cmake_args(self): + # No need for testing for the install + args = ["-DBENCHMARK_ENABLE_TESTING=OFF"] + return args + def patch(self): filter_file( r'add_cxx_compiler_flag..fstrict.aliasing.', |