Merge lp:~dobey/indicator-location/fix-gtest into lp:indicator-location

[dobey]

Use gmock module from cmake-extras.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:162
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-location-ci/4/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1618
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1625
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1403
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1403/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1403
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1403/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1403
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1403/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1403
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1403/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1403
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1403/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1403
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1403/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-location-ci/4/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-05-24 11:22:19 +0000
+++ CMakeLists.txt	2017-02-07 19:04:44 +0000
@@ -81,9 +81,6 @@
 
 # testing & coverage
 if (${enable_tests})
-  set (GTEST_SOURCE_DIR /usr/src/gtest/src)
-  set (GTEST_INCLUDE_DIR ${GTEST_SOURCE_DIR}/..)
-  set (GTEST_LIBS -lpthread)
   enable_testing ()
   if (${enable_lcov})
     include(GCov)
 
=== modified file 'INSTALL'
--- INSTALL	2013-08-25 20:31:26 +0000
+++ INSTALL	2017-02-07 19:04:44 +0000
@@ -21,7 +21,7 @@
  - cmake (cmake, 2.8.9 or later)
  - gcovr (gcovr, 2.4 or later)
  - lcov (lcov, 1.9 or later)
- - google test (libgtest-dev, 1.6.0 or later)
+ - google test (googletest or google-mock, 1.6.0 or later)
  - ubuntu-platform-api (libubuntu-platform-api1)
 
 Building the code
 
=== modified file 'debian/control'
--- debian/control	2016-07-19 08:47:36 +0000
+++ debian/control	2017-02-07 19:04:44 +0000
@@ -3,12 +3,13 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
+               cmake-extras (>= 0.10),
                dbus,
                debhelper (>= 9),
                dh-translations,
+               googletest | google-mock,
                intltool (>= 0.35.0), 
                libglib2.0-dev (>= 2.36),
-               libgtest-dev,
                libubuntu-app-launch2-dev,
                liburl-dispatcher1-dev,
                python,
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-01-22 17:49:24 +0000
+++ tests/CMakeLists.txt	2017-02-07 19:04:44 +0000
@@ -1,13 +1,5 @@
-
-###
-###  Google Test Framework
-###
-
-add_library (gtest STATIC 
-             ${GTEST_SOURCE_DIR}/gtest-all.cc 
-             ${GTEST_SOURCE_DIR}/gtest_main.cc)
-set_target_properties (gtest PROPERTIES INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIR})
-set_target_properties (gtest PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS} -w)
+find_package (GMock)
+include_directories (${GMOCK_INCLUDE_DIRS})
 
 ###
 ###  General setup
@@ -30,15 +22,9 @@
 add_executable (${TEST_NAME} ${TEST_NAME}.cc)
 add_test (${TEST_NAME} ${TEST_NAME})
 add_dependencies (${TEST_NAME} ${SERVICE_LIB})
-target_link_libraries (${TEST_NAME} ${SERVICE_LIB} gtest ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS})
-
-###
-###  globals
-###
-
-#set_property (TARGET ${ALL_TESTS}
-#              APPEND PROPERTY LINK_LIBRARIES libindicator-location-service gtest ${GTEST_LIBS} ${GCOV_LIBS})
-#
-#set_property (TARGET ${ALL_TESTS} gtest
-#              APPEND PROPERTY INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR} ${SERVICE_INCLUDE_DIRS} ${GTEST_INCLUDE_DIR})
-
+target_link_libraries (${TEST_NAME}
+  ${SERVICE_LIB}
+  ${SERVICE_DEPS_LIBRARIES}
+
+  ${GMOCK_LIBRARIES}
+)