hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updates to Google Benchmark package: (#8056)

Browse source 
- 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
This commit is contained in:
Andrew Gaspar 2018-05-08 12:04:19 -06:00 committed by Adam J. Stewart
parent bb5ef39ad2
commit 29b11f624f
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
var/spack/repos/builtin/packages/benchmark/package.py
View file

@ -36,6 +36,8 @@ class Benchmark(CMakePackage):
# first properly installed CMake config packages in # first properly installed CMake config packages in
# 1.2.0 release: https://github.com/google/benchmark/issues/363 # 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.2.0', '48d0b090cd7a84af2c4a28c8dc963c74')
version('1.1.0', '66b2a23076cf70739525be0092fc3ae3') version('1.1.0', '66b2a23076cf70739525be0092fc3ae3')
version('1.0.0', '1474ff826f8cd68067258db75a0835b8') version('1.0.0', '1474ff826f8cd68067258db75a0835b8')
@ -45,6 +47,14 @@ class Benchmark(CMakePackage):
values=('Debug', 'Release', 'RelWithDebInfo', values=('Debug', 'Release', 'RelWithDebInfo',
'MinSizeRel', 'Coverage')) '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): def patch(self):
filter_file( filter_file(
r'add_cxx_compiler_flag..fstrict.aliasing.', r'add_cxx_compiler_flag..fstrict.aliasing.',