Merge lp:~didrocks/location-service/build-with-system-gmock into lp:location-service/trunk

[Didier Roche-Tolomelli]

Adapt to new gmock snapshot (which doesn't ship anymore shared lib)

Adapt to new gmock snapshot (which doesn't ship anymore shared lib)

/!\ need the new gmock snapshot in distro first (right now in ppa:didrocks/ppa)

[Thomas Voß (thomas-voss)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:17
http://jenkins.qa.ubuntu.com/job/location-service-ci/20/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-saucy-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-saucy-armhf-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-saucy-i386-ci/11/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/location-service-ci/20/rebuild

review: Needs Fixing (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

approving globally now that new gmock is available

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-07-04 11:01:19 +0000
+++ debian/control	2013-07-08 06:41:23 +0000
@@ -9,7 +9,7 @@
                debhelper (>= 9),
                doxygen,
                geoclue-ubuntu-geoip,
-               google-mock,
+               google-mock (>= 1.6.0+svn437),
                lcov,
                libboost-program-options-dev,
                libboost-system-dev,

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-06-10 11:10:00 +0000
+++ tests/CMakeLists.txt	2013-07-08 06:41:23 +0000
@@ -1,5 +1,3 @@
-add_subdirectory(/usr/src/gtest gtest)
-
 find_package(Threads)
 
 option(
@@ -13,6 +11,17 @@
     message(STATUS "Executing test suite under dbus-test-runner")
 endif (LOCATION_SERVICE_ENABLE_DBUS_TEST_RUNNER)
 
+# 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")
+include_directories (
+  ${GMOCK_INCLUDE_DIR}
+  ${GTEST_INCLUDE_DIR}
+)
+
 add_executable(
     acceptance_tests
     acceptance_tests.cpp