Merge lp:~phablet-team/messaging-framework/fix-lsb-release-dependency into lp:messaging-framework

Proposed by Tiago Salem Herrmann on 2016-11-30
Status: Merged
Approved by: Bill Filler on 2016-12-08
Approved revision: 78
Merged at revision: 73
Proposed branch: lp:~phablet-team/messaging-framework/fix-lsb-release-dependency
Merge into: lp:messaging-framework
Diff against target: 158 lines (+79/-13)
5 files modified
CMakeLists.txt (+3/-0)
cmake/FindGtest.cmake (+67/-0)
tests/CMakeLists.txt (+2/-8)
tests/unit/messaging/CMakeLists.txt (+4/-4)
tools/get_soversion.sh (+3/-1)
To merge this branch: bzr merge lp:~phablet-team/messaging-framework/fix-lsb-release-dependency
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Approve on 2016-12-08
Roberto Mier Escandón  (community) 2016-11-30 Approve on 2016-11-30
Review via email: mp+312149@code.launchpad.net

Commit message

Add missing dependency.

Description of the change

Add missing dependency.

To post a comment you must log in.

FAILED: Continuous integration, rev:73
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/102/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2085/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2088
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1918
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1918/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1918
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1918/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1918/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1918
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1918/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1918
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1918/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1918/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1918
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1918/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1918
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1918/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1918/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/102/rebuild

review: Needs Fixing (continuous-integration)

lgtm

review: Approve

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-autoland/45/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2087/console
    None: https://jenkins.canonical.com/system-apps/job/lp-generic-land-mp/62/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2090
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1920
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1920/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1920
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1920/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1920/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1920
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1920/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1920
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1920/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1920/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1920
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1920/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1920
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1920/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1920/console

review: Needs Fixing (continuous-integration)

FAILED: Continuous integration, rev:74
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/103/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2126/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2129
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1957
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1957/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1957
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1957/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1957/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1957
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1957/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1957
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1957/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1957/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1957
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1957/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1957
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1957/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1957/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/103/rebuild

review: Needs Fixing (continuous-integration)

FAILED: Continuous integration, rev:75
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/104/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2128/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2131
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1959/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1959/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1959/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1959/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1959/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1959/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1959/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1959/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1959/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/104/rebuild

review: Needs Fixing (continuous-integration)

FAILED: Continuous integration, rev:76
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/105/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2132/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2135
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1963/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1963
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1963/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1963
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1963/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1963/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1963/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1963
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1963/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1963/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1963
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1963/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1963
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1963/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/105/rebuild

review: Needs Fixing (continuous-integration)

PASSED: Continuous integration, rev:77
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/106/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2146
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/550
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2149
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1977
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1977/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1977
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1977/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1977
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1977/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1977
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1977/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1977
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1977/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1977
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1977/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1977
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1977/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1977
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1977/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1977
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1977/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/106/rebuild

review: Approve (continuous-integration)

PASSED: Continuous integration, rev:78
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/107/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2147
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/551
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2150
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1978
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1978
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1978
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1978
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1978
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1978
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1978
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1978
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1978
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1978/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/107/rebuild

review: Approve (continuous-integration)

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-autoland/47/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2149/console
    None: https://jenkins.canonical.com/system-apps/job/lp-generic-land-mp/64/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2152
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1980
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1980/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1980
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1980/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1980/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1980
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1980/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1980
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1980/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1980
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1980/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1980
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1980/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1980
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1980/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1980
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1980/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-11-10 16:20:00 +0000
3+++ CMakeLists.txt 2016-12-07 19:42:48 +0000
4@@ -26,6 +26,9 @@
5 pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
6 pkg_check_modules(TP_QT5 REQUIRED TelepathyQt5)
7
8+find_package(Gtest REQUIRED)
9+include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
10+
11 # Enable handy automoc functionality.
12 add_definitions(-DQT_NO_KEYWORDS)
13 set(CMAKE_INCLUDE_CURRENT_DIR ON)
14
15=== added file 'cmake/FindGtest.cmake'
16--- cmake/FindGtest.cmake 1970-01-01 00:00:00 +0000
17+++ cmake/FindGtest.cmake 2016-12-07 19:42:48 +0000
18@@ -0,0 +1,67 @@
19+include(ExternalProject)
20+include(FindPackageHandleStandardArgs)
21+
22+#gtest
23+if (EXISTS /usr/src/googletest)
24+ set (USING_GOOGLETEST_1_8 TRUE)
25+ set (GTEST_INSTALL_DIR /usr/src/googletest/googletest/include)
26+else()
27+ set(GTEST_INSTALL_DIR /usr/src/gmock/gtest/include)
28+endif()
29+find_path(GTEST_INCLUDE_DIR gtest/gtest.h
30+ HINTS ${GTEST_INSTALL_DIR})
31+
32+#gmock
33+find_path(GMOCK_INSTALL_DIR CMakeLists.txt
34+ HINTS /usr/src/googletest /usr/src/gmock)
35+if(${GMOCK_INSTALL_DIR} STREQUAL "GMOCK_INSTALL_DIR-NOTFOUND")
36+ message(FATAL_ERROR "google-mock package not found")
37+endif()
38+
39+find_path(GMOCK_INCLUDE_DIR gmock/gmock.h)
40+
41+if (USING_GOOGLETEST_1_8)
42+ set(GMOCK_BASE_BINARY_DIR ${CMAKE_BINARY_DIR}/gmock/libs)
43+ set(GMOCK_BINARY_DIR ${GMOCK_BASE_BINARY_DIR}/googlemock)
44+ set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
45+else()
46+ set(GMOCK_BASE_BINARY_DIR ${CMAKE_BINARY_DIR}/gmock/libs)
47+ set(GMOCK_BINARY_DIR ${GMOCK_BASE_BINARY_DIR})
48+ set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
49+endif()
50+
51+set(GTEST_CMAKE_ARGS "")
52+if (${MIR_IS_CROSS_COMPILING})
53+ set(GTEST_CMAKE_ARGS
54+ -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
55+endif()
56+
57+if (USING_GOOGLETEST_1_8)
58+ list(APPEND GTEST_CMAKE_ARGS -DBUILD_GTEST=ON)
59+endif()
60+
61+ExternalProject_Add(
62+ GMock
63+ #where to build in source tree
64+ PREFIX ${GMOCK_PREFIX}
65+ #where the source is external to the project
66+ SOURCE_DIR ${GMOCK_INSTALL_DIR}
67+ #forward the compilers to the subproject so cross-arch builds work
68+ CMAKE_ARGS ${GTEST_CMAKE_ARGS} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_POSITION_INDEPENDENT_CODE=ON
69+ BINARY_DIR ${GMOCK_BASE_BINARY_DIR}
70+
71+ #we don't need to install, so skip
72+ INSTALL_COMMAND ""
73+)
74+
75+set(GMOCK_LIBRARY ${GMOCK_BINARY_DIR}/libgmock.a)
76+set(GMOCK_MAIN_LIBRARY ${GMOCK_BINARY_DIR}/libgmock_main.a)
77+set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARY} ${GMOCK_MAIN_LIBRARY})
78+set(GTEST_LIBRARY ${GTEST_BINARY_DIR}/libgtest.a)
79+set(GTEST_MAIN_LIBRARY ${GTEST_BINARY_DIR}/libgtest_main.a)
80+set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
81+set(GTEST_ALL_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
82+
83+find_package_handle_standard_args(GTest DEFAULT_MSG
84+ GMOCK_INCLUDE_DIR
85+ GTEST_INCLUDE_DIR)
86
87=== modified file 'tests/CMakeLists.txt'
88--- tests/CMakeLists.txt 2016-11-10 16:20:00 +0000
89+++ tests/CMakeLists.txt 2016-12-07 19:42:48 +0000
90@@ -12,13 +12,6 @@
91 # Disable the respective warning selectively for tests only.
92 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers")
93
94-# Build with system gmock and embedded gtest
95-set (GMOCK_INCLUDE_DIR "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
96-set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
97-set (GTEST_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
98-set (GMOCK_BOTH_LIBRARIES gmock gmock_main)
99-add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
100-
101 include_directories(
102 ${CMAKE_CURRENT_BINARY_DIR}
103 ${CMAKE_CURRENT_SOURCE_DIR}
104@@ -44,6 +37,7 @@
105 file(GLOB_RECURSE TEST_H_FILES *.h)
106 add_custom_target(test_dot_h_files ALL SOURCES ${TEST_H_FILES})
107
108-target_link_libraries(testing-mocks messaging-framework gmock gmock_main)
109+target_link_libraries(testing-mocks messaging-framework ${GMOCK_LIBRARY})
110+set_target_properties(testing-mocks PROPERTIES POSITION_INDEPENDENT_CODE ON)
111
112 add_subdirectory(unit)
113
114=== modified file 'tests/unit/messaging/CMakeLists.txt'
115--- tests/unit/messaging/CMakeLists.txt 2016-11-10 16:20:00 +0000
116+++ tests/unit/messaging/CMakeLists.txt 2016-12-07 19:42:48 +0000
117@@ -1,5 +1,5 @@
118 # Make sure that we can easily bootstrap a private dbus instance.
119-add_definitions(-DCORE_DBUS_ENABLE_GOOGLE_TEST_FIXTURE -DTP_QT_ENABLE_LOWLEVEL_API)
120+add_definitions(-DCORE_DBUS_ENABLE_GOOGLE_TEST_FIXTURE -DTP_QT_ENABLE_LOWLEVEL_API -fPIC)
121
122 # Enable handy automock'ing and auto include of generated files.
123 set(CMAKE_INCLUDE_CURRENT_DIR ON)
124@@ -48,8 +48,8 @@
125 testing-mocks
126 messaging-framework
127
128- gmock
129- gmock_main
130+ ${GMOCK_LIBRARY}
131+ ${GTEST_BOTH_LIBRARIES}
132
133 ${DBUS_CPP_LDFLAGS}
134 ${PROCESS_CPP_LDFLAGS}
135@@ -66,7 +66,7 @@
136
137 # Simple shared object that is used in unit-testing the messaging::DynamicLibrary.
138 add_library(test-library SHARED test_library.cpp)
139-target_link_libraries(test-library testing-mocks gmock gmock_main)
140+target_link_libraries(test-library testing-mocks)
141
142 MSG_FW_ADD_TEST(associative-dictionary-test associative_dictionary_test.cpp)
143 MSG_FW_ADD_TEST(boost-variant-test boost_variant_test.cpp)
144
145=== modified file 'tools/get_soversion.sh'
146--- tools/get_soversion.sh 2016-11-11 12:58:48 +0000
147+++ tools/get_soversion.sh 2016-12-07 19:42:48 +0000
148@@ -17,7 +17,9 @@
149
150 set -eu
151
152-[ -n "${SERIES:-}" ] || SERIES=$(lsb_release -c -s)
153+. /etc/lsb-release
154+
155+[ -n "${SERIES:-}" ] || SERIES=$DISTRIB_CODENAME
156
157 case "$SERIES" in
158 trusty)

Subscribers

People subscribed via source and target branches

to all changes: