Merge lp:~sil2100/dbus-cpp/fix_ftbfs into lp:dbus-cpp

[Łukasz Zemczak]

Fix FTBFS on bionic by switching to use cmake-extras and not enforcing -pedantic anymore as current gtest macros do not follow strict standards anymore.

Fix FTBFS on bionic by switching to use cmake-extras and not enforcing -pedantic anymore as current gtest macros do not follow strict standards anymore.

Using -pedantic doesn't make sense for a project that is not actively maintained anymore anyway.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-11-21 21:19:11 +0000
+++ CMakeLists.txt	2017-10-31 19:10:08 +0000
@@ -61,8 +61,8 @@
 
 include(GNUInstallDirs)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -pedantic -Wextra -fvisibility=hidden -fPIC -pthread")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -pedantic -Wextra -fPIC -pthread")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -Wextra -fvisibility=hidden -fPIC -pthread")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -Wextra -fPIC -pthread")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
 
 # We leverage GCC's sanitize functionality
 
=== modified file 'debian/control'
--- debian/control	2016-08-09 07:31:30 +0000
+++ debian/control	2017-10-31 19:10:08 +0000
@@ -7,6 +7,7 @@
 Priority: optional
 Maintainer: Thomas Voß <[e-mail]>
 Build-Depends: cmake,
+               cmake-extras,
                dbus,
                debhelper (>= 9),
                doxygen,
 
=== modified file 'debian/control.in'
--- debian/control.in	2015-11-21 21:48:12 +0000
+++ debian/control.in	2017-10-31 19:10:08 +0000
@@ -2,6 +2,7 @@
 Priority: optional
 Maintainer: Thomas Voß <[e-mail]>
 Build-Depends: cmake,
+               cmake-extras,
                dbus,
                debhelper (>= 9),
                doxygen,
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-09-28 21:27:09 +0000
+++ tests/CMakeLists.txt	2017-10-31 19:10:08 +0000
@@ -15,13 +15,8 @@
 # Authored by: Thomas Voss <[e-mail]>
 
 # 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")
-
-set(GTEST_BOTH_LIBRARIES gmock gtest gtest_main)
+find_package(GMock)
+
 find_package(Threads)
 
 add_definitions(-DCORE_DBUS_ENABLE_GOOGLE_TEST_FIXTURE)
@@ -125,6 +120,7 @@
   ${CMAKE_THREAD_LIBS_INIT}
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
+  ${GMOCK_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   ${PROCESS_CPP_LIBRARIES}
 )
@@ -138,6 +134,7 @@
   ${CMAKE_THREAD_LIBS_INIT}
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
+  ${GMOCK_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   ${PROCESS_CPP_LIBRARIES}
 )
@@ -150,6 +147,7 @@
   ${CMAKE_THREAD_LIBS_INIT}
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
+  ${GMOCK_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   ${PROCESS_CPP_LIBRARIES}
 )
@@ -163,6 +161,7 @@
   ${CMAKE_THREAD_LIBS_INIT}
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
+  ${GMOCK_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   )
 
@@ -175,6 +174,7 @@
   ${CMAKE_THREAD_LIBS_INIT}
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
+  ${GMOCK_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   )
 
@@ -187,6 +187,7 @@
   ${CMAKE_THREAD_LIBS_INIT}
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
+  ${GMOCK_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   )
 
@@ -201,6 +202,7 @@
   ${DBUS_LIBRARIES}
   ${LIBXML2_LIBRARIES}
   ${GMOCK_LIBRARY}
+  ${GMOCK_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   )
 
@@ -213,6 +215,7 @@
   ${CMAKE_THREAD_LIBS_INIT}
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
+  ${GMOCK_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   )
 
@@ -225,6 +228,7 @@
   ${CMAKE_THREAD_LIBS_INIT}
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
+  ${GMOCK_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   )
 
@@ -237,6 +241,7 @@
   ${CMAKE_THREAD_LIBS_INIT}
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
+  ${GMOCK_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   )
 
@@ -249,6 +254,7 @@
   ${CMAKE_THREAD_LIBS_INIT}
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
+  ${GMOCK_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   )
 
@@ -261,6 +267,7 @@
   ${CMAKE_THREAD_LIBS_INIT}
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
+  ${GMOCK_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   )
 
@@ -273,6 +280,7 @@
   ${CMAKE_THREAD_LIBS_INIT}
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
+  ${GMOCK_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   )
 
@@ -284,6 +292,7 @@
   ${CMAKE_THREAD_LIBS_INIT}
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
+  ${GMOCK_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   )
 
@@ -295,6 +304,7 @@
   ${CMAKE_THREAD_LIBS_INIT}
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
+  ${GMOCK_LIBRARIES}
   ${GTEST_BOTH_LIBRARIES}
   )
 
 
=== modified file 'tests/service_test.cpp'
--- tests/service_test.cpp	2014-07-30 16:12:16 +0000
+++ tests/service_test.cpp	2017-10-31 19:10:08 +0000
@@ -134,7 +134,7 @@
             });
 
             auto readonly_property = stub->get_property<test::Service::Properties::ReadOnly>();
-            EXPECT_EQ(readonly_property->get(), 7);
+            EXPECT_EQ(readonly_property->get(), (std::uint32_t)7);
             std::uint32_t changed_value = 0;
             readonly_property->changed().connect([&changed_value](std::uint32_t value){
                 changed_value = value;