Merge lp:~thomas-voss/location-service/fix-zesty-ftbfs into lp:location-service

[Thomas Voß]

Fix location-service FTBFS on zesty, mainly tracked on LP: #1640320

There are 2 compound causes for the FTBFS:
1. googletest update that caused cmake errors
2. missing vector includes that caused undefined reference errors

== googletest update issues ==
The googletest updated error is better described on LP: #1644062. The same fix applied to cmake-extras [1] (see comment #3 [2]) allows to detect and set the right paths for gtest and gmock, but then it runs into the same problem as comment #7 [3] which again causes the build to fail because dh_install complains about the extra files installed by googletest. This issue is better described by the commit that introduced the googletest install clause [4] and the comments there indicate that bundling googletest is not recomended - it should instead be added as an external project. This is exactly the approach taken by GMockConfig.make [5] file in cmake-extras does. The proposed solution for the first part of the FTBFS fix is to rely on that to properly reference and include both gtest and gmock.

== missing vector includes ==
The missing includes for vector causes yet another FTBFS. The includes used in this merge are simple a suggestion, I'm not familiar with location-service code so it is very likely that there is a better place to put those (or even use a different include).

[1] https://code.launchpad.net/~michihenning/cmake-extras/gtest-fixes/+merge/311565
[2] https://bugs.launchpad.net/ubuntu/+source/googletest/+bug/1644062/comments/3
[3] https://bugs.launchpad.net/ubuntu/+source/googletest/+bug/1644062/comments/7
[4] https://github.com/google/googletest/commit/98d988deac06637364f6cd41c45c3db4a8a0b6bc
[5] http://bazaar.launchpad.net/~cmake-extras/cmake-extras/trunk/view/head:/src/GMock/GMockConfig.cmake

Fix location-service FTBFS on zesty, mainly tracked on LP: #1640320

There are 2 compound causes for the FTBFS:
1. googletest update that caused cmake errors
2. missing vector includes that caused undefined reference errors

== googletest update issues ==
The googletest updated error is better described on LP: #1644062. The same fix applied to cmake-extras [1] (see comment #3 [2]) allows to detect and set the right paths for gtest and gmock, but then it runs into the same problem as comment #7 [3] which again causes the build to fail because dh_install complains about the extra files installed by googletest. This issue is better described by the commit that introduced the googletest install clause [4] and the comments there indicate that bundling googletest is not recomended - it should instead be added as an external project. This is exactly the approach taken by GMockConfig.make [5] file in cmake-extras does. The proposed solution for the first part of the FTBFS fix is to rely on that to properly reference and include both gtest and gmock.

== missing vector includes ==
The missing includes for vector causes yet another FTBFS. The includes used in this merge are simple a suggestion, I'm not familiar with location-service code so it is very likely that there is a better place to put those (or even use a different include).

[1] https://code.launchpad.net/~michihenning/cmake-extras/gtest-fixes/+merge/311565
[2] https://bugs.launchpad.net/ubuntu/+source/googletest/+bug/1644062/comments/3
[3] https://bugs.launchpad.net/ubuntu/+source/googletest/+bug/1644062/comments/7
[4] https://github.com/google/googletest/commit/98d988deac06637364f6cd41c45c3db4a8a0b6bc
[5] http://bazaar.launchpad.net/~cmake-extras/cmake-extras/trunk/view/head:/src/GMock/GMockConfig.cmake

[Thomas Voß (thomas-voss)]

LGTM.

review: Approve

=== modified file 'debian/control'
--- debian/control	2017-03-07 10:01:34 +0000
+++ debian/control	2017-03-30 18:31:14 +0000
@@ -9,6 +9,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Thomas Voß <[e-mail]>
 Build-Depends: cmake,
+               cmake-extras,
                curl,
                libdbus-cpp-dev (>= 4.1.0),
                debhelper (>= 9),

=== modified file 'debian/control.in'
--- debian/control.in	2017-03-07 10:01:34 +0000
+++ debian/control.in	2017-03-30 18:31:14 +0000
@@ -4,6 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Thomas Voß <[e-mail]>
 Build-Depends: cmake,
+               cmake-extras,
                curl,
                libdbus-cpp-dev (>= 4.1.0),
                debhelper (>= 9),

=== modified file 'snapcraft.yaml'
--- snapcraft.yaml	2017-03-24 21:13:53 +0000
+++ snapcraft.yaml	2017-03-30 18:31:14 +0000
@@ -53,6 +53,8 @@
       - -DUBUNTU_LOCATION_SERVICE_VERSION_MAJOR=4
     source: .
     build-packages:
+      - cmake
+      - cmake-extras
       - curl
       - doxygen
       - gcc

=== modified file 'src/location/providers/fusion/provider.h'
--- src/location/providers/fusion/provider.h	2016-08-18 14:56:31 +0000
+++ src/location/providers/fusion/provider.h	2017-03-30 18:31:14 +0000
@@ -21,6 +21,8 @@
 #include <location/provider.h>
 #include <location/providers/fusion/update_selector.h>
 
+#include <vector>
+
 namespace location
 {
 namespace providers

=== modified file 'src/location/providers/gps/android_hardware_abstraction_layer.cpp'
--- src/location/providers/gps/android_hardware_abstraction_layer.cpp	2016-08-24 14:12:05 +0000
+++ src/location/providers/gps/android_hardware_abstraction_layer.cpp	2017-03-30 18:31:14 +0000
@@ -30,6 +30,7 @@
 #include <boost/property_tree/ini_parser.hpp>
 
 #include <random>
+#include <vector>
 
 namespace gps = location::providers::gps;
 namespace android = location::providers::gps::android;

=== modified file 'src/location/providers/gps/android_hardware_abstraction_layer.h'
--- src/location/providers/gps/android_hardware_abstraction_layer.h	2016-08-18 14:56:31 +0000
+++ src/location/providers/gps/android_hardware_abstraction_layer.h	2017-03-30 18:31:14 +0000
@@ -23,6 +23,8 @@
 
 #include <ubuntu/hardware/gps.h>
 
+#include <vector>
+
 namespace location { namespace providers { namespace gps
 {
 namespace android

=== modified file 'src/location/providers/gps/sntp_client.cpp'
--- src/location/providers/gps/sntp_client.cpp	2016-06-26 21:17:03 +0000
+++ src/location/providers/gps/sntp_client.cpp	2017-03-30 18:31:14 +0000
@@ -28,6 +28,7 @@
 #include <future>
 #include <iostream>
 #include <thread>
+#include <vector>
 
 namespace gps = location::providers::gps;
 namespace ip = boost::asio::ip;

=== modified file 'src/location/providers/proxy.h'
--- src/location/providers/proxy.h	2016-08-18 14:56:31 +0000
+++ src/location/providers/proxy.h	2017-03-30 18:31:14 +0000
@@ -21,6 +21,7 @@
 #include <location/provider.h>
 
 #include <set>
+#include <vector>
 
 namespace location
 {

=== modified file 'src/location/providers/ubx/_8/assist_now_online_client.cpp'
--- src/location/providers/ubx/_8/assist_now_online_client.cpp	2017-03-24 21:13:53 +0000
+++ src/location/providers/ubx/_8/assist_now_online_client.cpp	2017-03-30 18:31:14 +0000
@@ -18,6 +18,8 @@
 #include <core/net/uri.h>
 #include <core/net/http/response.h>
 
+#include <boost/format.hpp>
+
 #include <iostream>
 
 namespace _8 = location::providers::ubx::_8;

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2017-03-07 10:01:34 +0000
+++ tests/CMakeLists.txt	2017-03-30 18:31:14 +0000
@@ -21,11 +21,7 @@
     PROPERTIES COMPILE_FLAGS "-std=c99")
 
 # 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")
+find_package(GMock)
 
 macro(LOCATION_SERVICE_ADD_TEST test_name src)
   add_executable(
@@ -47,10 +43,8 @@
 
     ${ARGN}
 
-    gmock
-
-    gtest
-    gtest_main)
+    ${GMOCK_LIBRARIES}
+    ${GTEST_BOTH_LIBRARIES})
 
   add_test(${test_name} ${CMAKE_CURRENT_BINARY_DIR}/${test_name} --gtest_filter=*-*requires*)
 
@@ -106,8 +100,7 @@
     ${Boost_LIBRARIES}
     ${PROCESS_CPP_LIBRARIES}
 
-    gtest
-    gtest_main
+    ${GTEST_BOTH_LIBRARIES}
   )
   if (LOCATION_SERVICE_ENABLE_DBUS_TEST_RUNNER)
     add_test(geoclue_provider_test ${DBUS_TEST_RUNNER_EXECUTABLE} --task=${CMAKE_CURRENT_BINARY_DIR}/geoclue_provider_test)