Merge lp:~sil2100/dbus-cpp/fix_ftbfs_gtest into lp:dbus-cpp

[Łukasz Zemczak]

Switch to using cmake-extras for the gmock and gtest bits.

Switch to using cmake-extras for the gmock and gtest bits.

Unmerged revisions

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

Switch to using cmake-extras for the gmock and gtest bits.

=== modified file 'debian/control'
--- debian/control	2016-08-09 07:31:30 +0000
+++ debian/control	2017-04-06 16:40:08 +0000
@@ -7,6 +7,7 @@
 Priority: optional
 Maintainer: Thomas Voß <[e-mail]>
 Build-Depends: cmake,
+               cmake-extras,
                dbus,
                debhelper (>= 9),
                doxygen,

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-09-28 21:27:09 +0000
+++ tests/CMakeLists.txt	2017-04-06 16:40:08 +0000
@@ -15,13 +15,8 @@
 # Authored by: Thomas Voss <[e-mail]>
 
 # 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")
-
-set(GTEST_BOTH_LIBRARIES gmock gtest gtest_main)
+find_package(GMock)
+
 find_package(Threads)
 
 add_definitions(-DCORE_DBUS_ENABLE_GOOGLE_TEST_FIXTURE)