Merge lp:~sil2100/biometryd/fix_ftbfs_gmock into lp:biometryd

[Łukasz Zemczak]

Switch to using cmake-extras for gmock and gtest.

Work in progress! First try on fixing the gmock related build failure.

[lp:~sil2100/biometryd/fix_ftbfs_gmock]

44. By Łukasz Zemczak on 2017-04-06

The leftover add_subdirectory of gmock makes CMake still bail out. Thanks to Pete Woods\!

Unmerged revisions

44. By Łukasz Zemczak on 2017-04-06

The leftover add_subdirectory of gmock makes CMake still bail out. Thanks to Pete Woods\!

43. By Łukasz Zemczak on 2017-04-06

First try on fixing the gmock related build failure.

=== modified file 'debian/control'
--- debian/control	2016-09-22 16:56:34 +0000
+++ debian/control	2017-04-06 16:09:43 +0000
@@ -7,6 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
+               cmake-extras,
                debhelper (>= 9),
                doxygen,
                google-mock,

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-09-22 16:56:34 +0000
+++ tests/CMakeLists.txt	2017-04-06 16:09:43 +0000
@@ -6,11 +6,7 @@
 configure_file(config.cpp.in config.cpp)
 include_directories(.)
 # Build with system gmock and embedded gtest
-set (GMOCK_INCLUDE_DIR "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
-set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
-set (GTEST_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
-
-add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
+find_package(GMock)
 
 # Ensure that we have a ready-made fixture maintaining a private bus instance
 # readily available in unit- and integration tests.
@@ -38,10 +34,8 @@
 
     ${ARGN}
 
-    gmock
-
-    gtest
-    gtest_main)
+    ${GMOCK_LIBRARIES}
+    ${GTEST_BOTH_LIBRARIES})
 
   add_test(${test_name} ${CMAKE_CURRENT_BINARY_DIR}/${test_name} --gtest_filter=*-*requires*)
   set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BIOMETRYD_DBUS_SKELETON_IS_RUNNING_UNDER_TESTING=1")