zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msgpack-c, snappy: explicitly depend on googletest (#9167)

Browse Source
This commit is contained in:
Matthias Wolf 2018-09-04 03:25:17 +02:00 committed by Adam J. Stewart
parent 734d6306a2
commit 4df60caf5b
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
var/spack/repos/builtin/packages/msgpack-c/package.py
View File

@ -34,10 +34,13 @@ class MsgpackC(CMakePackage):
version('1.4.1', 'e2fd3a7419b9bc49e5017fdbefab87e0') version('1.4.1', 'e2fd3a7419b9bc49e5017fdbefab87e0')
depends_on('cmake@2.8.12:', type='build') depends_on('cmake@2.8.12:', type='build')
depends_on('googletest', type='test')
def cmake_args(self): def cmake_args(self):
args = [ args = [
"-DCMAKE_CXX_FLAGS=-Wno-implicit-fallthrough", "-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 return args

11
var/spack/repos/builtin/packages/snappy/link_gtest.patch Normal file
View File

@ -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)

8
var/spack/repos/builtin/packages/snappy/package.py
View File

@ -36,6 +36,10 @@ class Snappy(CMakePackage):
variant('shared', default=True, description='Build shared libraries') variant('shared', default=True, description='Build shared libraries')
variant('pic', default=True, description='Build position independent code') variant('pic', default=True, description='Build position independent code')
depends_on('googletest', type='test')
patch('link_gtest.patch')
def cmake_args(self): def cmake_args(self):
spec = self.spec spec = self.spec
@ -43,7 +47,9 @@ def cmake_args(self):
'-DCMAKE_INSTALL_LIBDIR:PATH={0}'.format( '-DCMAKE_INSTALL_LIBDIR:PATH={0}'.format(
self.prefix.lib), self.prefix.lib),
'-DBUILD_SHARED_LIBS:BOOL={0}'.format( '-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 return args