diff options
| author | Matthias Wolf <m+git@sushinara.net> | 2018-09-04 03:25:17 +0200 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-09-03 20:25:17 -0500 |
| commit | 4df60caf5bd95dd764ed13e2352b4d28cd595ee0 (patch) | |
| tree | 06e7e2fa921e3d97a062366524814e5de30039db /var | |
| parent | 734d6306a261d209579ae473e5a004b65f55f6e2 (diff) | |
| download | spack-4df60caf5bd95dd764ed13e2352b4d28cd595ee0.tar.gz spack-4df60caf5bd95dd764ed13e2352b4d28cd595ee0.tar.bz2 spack-4df60caf5bd95dd764ed13e2352b4d28cd595ee0.tar.xz spack-4df60caf5bd95dd764ed13e2352b4d28cd595ee0.zip | |
msgpack-c, snappy: explicitly depend on googletest (#9167)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/msgpack-c/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/snappy/link_gtest.patch | 11 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/snappy/package.py | 8 |
3 files changed, 22 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/msgpack-c/package.py b/var/spack/repos/builtin/packages/msgpack-c/package.py index 0312b874f0..d8104555bb 100644 --- a/var/spack/repos/builtin/packages/msgpack-c/package.py +++ b/var/spack/repos/builtin/packages/msgpack-c/package.py @@ -34,10 +34,13 @@ class MsgpackC(CMakePackage): version('1.4.1', 'e2fd3a7419b9bc49e5017fdbefab87e0') depends_on('cmake@2.8.12:', type='build') + depends_on('googletest', type='test') def cmake_args(self): args = [ "-DCMAKE_CXX_FLAGS=-Wno-implicit-fallthrough", - "-DCMAKE_C_FLAGS=-Wno-implicit-fallthrough" + "-DCMAKE_C_FLAGS=-Wno-implicit-fallthrough", + '-DMSGPACK_BUILD_TESTS:BOOL={0}'.format( + 'ON' if self.run_tests else 'OFF') ] return args diff --git a/var/spack/repos/builtin/packages/snappy/link_gtest.patch b/var/spack/repos/builtin/packages/snappy/link_gtest.patch new file mode 100644 index 0000000000..7a95b77036 --- /dev/null +++ b/var/spack/repos/builtin/packages/snappy/link_gtest.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2018-09-03 14:25:32.390110709 +0200 ++++ b/CMakeLists.txt 2018-09-03 14:24:16.198182317 +0200 +@@ -118,7 +118,7 @@ + "${PROJECT_SOURCE_DIR}/snappy-test.cc" + ) + target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H) +- target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES}) ++ target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES} ${GTEST_LIBRARIES}) + + if(HAVE_LIBZ) + target_link_libraries(snappy_unittest z) diff --git a/var/spack/repos/builtin/packages/snappy/package.py b/var/spack/repos/builtin/packages/snappy/package.py index cdcd192056..5a689a05d0 100644 --- a/var/spack/repos/builtin/packages/snappy/package.py +++ b/var/spack/repos/builtin/packages/snappy/package.py @@ -36,6 +36,10 @@ class Snappy(CMakePackage): variant('shared', default=True, description='Build shared libraries') variant('pic', default=True, description='Build position independent code') + depends_on('googletest', type='test') + + patch('link_gtest.patch') + def cmake_args(self): spec = self.spec @@ -43,7 +47,9 @@ class Snappy(CMakePackage): '-DCMAKE_INSTALL_LIBDIR:PATH={0}'.format( self.prefix.lib), '-DBUILD_SHARED_LIBS:BOOL={0}'.format( - 'ON' if '+shared' in spec else 'OFF') + 'ON' if '+shared' in spec else 'OFF'), + '-DSNAPPY_BUILD_TESTS:BOOL={0}'.format( + 'ON' if self.run_tests else 'OFF') ] return args |