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

Proposed by Didier Roche on 2013-07-08
Status: Merged
Approved by: Didier Roche on 2013-07-10
Approved revision: 17
Merged at revision: 20
Proposed branch: lp:~didrocks/location-service/build-with-system-gmock
Merge into: lp:location-service/trunk
Diff against target: 40 lines (+12/-3)
2 files modified
debian/control (+1/-1)
tests/CMakeLists.txt (+11/-2)
To merge this branch: bzr merge lp:~didrocks/location-service/build-with-system-gmock
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2013-07-10
Thomas Voß (community) 2013-07-08 Approve on 2013-07-08
Review via email: mp+173407@code.launchpad.net

Commit message

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

Description of the change

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)

To post a comment you must log in.
Thomas Voß (thomas-voss) wrote :

LGTM.

review: Approve
Didier Roche (didrocks) wrote :

approving globally now that new gmock is available

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-07-04 11:01:19 +0000
3+++ debian/control 2013-07-08 06:41:23 +0000
4@@ -9,7 +9,7 @@
5 debhelper (>= 9),
6 doxygen,
7 geoclue-ubuntu-geoip,
8- google-mock,
9+ google-mock (>= 1.6.0+svn437),
10 lcov,
11 libboost-program-options-dev,
12 libboost-system-dev,
13
14=== modified file 'tests/CMakeLists.txt'
15--- tests/CMakeLists.txt 2013-06-10 11:10:00 +0000
16+++ tests/CMakeLists.txt 2013-07-08 06:41:23 +0000
17@@ -1,5 +1,3 @@
18-add_subdirectory(/usr/src/gtest gtest)
19-
20 find_package(Threads)
21
22 option(
23@@ -13,6 +11,17 @@
24 message(STATUS "Executing test suite under dbus-test-runner")
25 endif (LOCATION_SERVICE_ENABLE_DBUS_TEST_RUNNER)
26
27+# Build with system gmock and embedded gtest
28+set (GMOCK_INCLUDE_DIR "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
29+set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
30+set (GTEST_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
31+
32+add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
33+include_directories (
34+ ${GMOCK_INCLUDE_DIR}
35+ ${GTEST_INCLUDE_DIR}
36+)
37+
38 add_executable(
39 acceptance_tests
40 acceptance_tests.cpp

Subscribers

People subscribed via source and target branches