Merge lp:~pete-woods/pay-service/cmake-extras-compatibility into lp:pay-service

[Pete Woods]

Compatibility with unversioned cmake-extras modules

Compatibility with unversioned cmake-extras modules

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

FAILED: Continuous integration, rev:140
https://jenkins.canonical.com/unity-api-1/job/lp-pay-service-ci/14/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1242/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1249
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1032/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1032/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1032/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1032/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1032/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1032/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-pay-service-ci/14/rebuild

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

review: Needs Fixing

[Pete Woods (pete-woods)]

Well spotted.

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

FAILED: Continuous integration, rev:141
https://jenkins.canonical.com/unity-api-1/job/lp-pay-service-ci/15/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1259/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1266
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1049
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1049/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1049/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1049
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1049/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1049/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1049
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1049/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1049/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-pay-service-ci/15/rebuild

review: Needs Fixing (continuous-integration)

[Michi Henning (michihenning)]

Looks good.

review: Approve

[Michi Henning (michihenning)]

Looks sensible.

review: Approve

[lp:~pete-woods/pay-service/cmake-extras-compatibility]

143. By Pete Woods on 2016-12-09

Another gmock fix

[dobey (dobey)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-05-20 14:27:28 +0000
+++ CMakeLists.txt	2016-12-09 13:12:33 +0000
@@ -97,7 +97,7 @@
 ##
 ##  Coverage Reports
 ##
-include(EnableCoverageReport)
+find_package(CoverageReport)
 set(filter-list)
 list(APPEND filter-list "/usr/include")
 list(APPEND filter-list "${CMAKE_SOURCE_DIR}/tests/*")

=== modified file 'debian/control'
--- debian/control	2016-08-22 13:48:58 +0000
+++ debian/control	2016-12-09 13:12:33 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
-               cmake-extras,
+               cmake-extras (>= 0.10),
                dbus,
                dbus-test-runner,
                debhelper (>= 9),

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-09-25 16:29:16 +0000
+++ tests/CMakeLists.txt	2016-12-09 13:12:33 +0000
@@ -1,11 +1,7 @@
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -g ${GCOV_FLAGS}")
 
 # 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")
-set (GMOCK_BOTH_LIBRARIES gmock gmock_main)
-add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
+find_package(GMock)
 
 find_package(Threads)
 
@@ -53,7 +49,7 @@
 function(add_test_by_name name)
   set(TEST_NAME ${name})
   add_executable(${TEST_NAME} ${TEST_NAME}.cpp ${libpay-tests-generated})
-  target_link_libraries(${TEST_NAME} libpay ${GMOCK_BOTH_LIBRARIES})
+  target_link_libraries(${TEST_NAME} libpay ${GMOCK_LIBRARIES})
   add_test(${TEST_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME})
 endfunction()
 add_test_by_name(libpay-iap-tests)