dbus-cpp

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

  1. fix_ftbfs
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 104
Merged at revision: 104
Proposed branch: lp:~sil2100/dbus-cpp/fix_ftbfs
Merge into: lp:dbus-cpp
Diff against target: 191 lines (+22/-10)
5 files modified
CMakeLists.txt (+2/-2)
debian/control (+1/-0)
debian/control.in (+1/-0)
tests/CMakeLists.txt (+17/-7)
tests/service_test.cpp (+1/-1)
To merge this branch: bzr merge lp:~sil2100/dbus-cpp/fix_ftbfs
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+333049@code.launchpad.net

Commit message

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.

Description of the change

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.

To post a comment you must log in.

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 2015-11-21 21:19:11 +0000
3+++ CMakeLists.txt 2017-10-31 19:10:08 +0000
4@@ -61,8 +61,8 @@
5
6 include(GNUInstallDirs)
7
8-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -pedantic -Wextra -fvisibility=hidden -fPIC -pthread")
9-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -pedantic -Wextra -fPIC -pthread")
10+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -Wextra -fvisibility=hidden -fPIC -pthread")
11+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -Wextra -fPIC -pthread")
12 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
13
14 # We leverage GCC's sanitize functionality
15
16=== modified file 'debian/control'
17--- debian/control 2016-08-09 07:31:30 +0000
18+++ debian/control 2017-10-31 19:10:08 +0000
19@@ -7,6 +7,7 @@
20 Priority: optional
21 Maintainer: Thomas Voß <thomas.voss@ubuntu.com>
22 Build-Depends: cmake,
23+ cmake-extras,
24 dbus,
25 debhelper (>= 9),
26 doxygen,
27
28=== modified file 'debian/control.in'
29--- debian/control.in 2015-11-21 21:48:12 +0000
30+++ debian/control.in 2017-10-31 19:10:08 +0000
31@@ -2,6 +2,7 @@
32 Priority: optional
33 Maintainer: Thomas Voß <thomas.voss@ubuntu.com>
34 Build-Depends: cmake,
35+ cmake-extras,
36 dbus,
37 debhelper (>= 9),
38 doxygen,
39
40=== modified file 'tests/CMakeLists.txt'
41--- tests/CMakeLists.txt 2014-09-28 21:27:09 +0000
42+++ tests/CMakeLists.txt 2017-10-31 19:10:08 +0000
43@@ -15,13 +15,8 @@
44 # Authored by: Thomas Voss <thomas.voss@canonical.com>
45
46 # Build with system gmock and embedded gtest
47-set (GMOCK_INCLUDE_DIR "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
48-set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
49-set (GTEST_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
50-
51-add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
52-
53-set(GTEST_BOTH_LIBRARIES gmock gtest gtest_main)
54+find_package(GMock)
55+
56 find_package(Threads)
57
58 add_definitions(-DCORE_DBUS_ENABLE_GOOGLE_TEST_FIXTURE)
59@@ -125,6 +120,7 @@
60 ${CMAKE_THREAD_LIBS_INIT}
61 ${Boost_LIBRARIES}
62 ${DBUS_LIBRARIES}
63+ ${GMOCK_LIBRARIES}
64 ${GTEST_BOTH_LIBRARIES}
65 ${PROCESS_CPP_LIBRARIES}
66 )
67@@ -138,6 +134,7 @@
68 ${CMAKE_THREAD_LIBS_INIT}
69 ${Boost_LIBRARIES}
70 ${DBUS_LIBRARIES}
71+ ${GMOCK_LIBRARIES}
72 ${GTEST_BOTH_LIBRARIES}
73 ${PROCESS_CPP_LIBRARIES}
74 )
75@@ -150,6 +147,7 @@
76 ${CMAKE_THREAD_LIBS_INIT}
77 ${Boost_LIBRARIES}
78 ${DBUS_LIBRARIES}
79+ ${GMOCK_LIBRARIES}
80 ${GTEST_BOTH_LIBRARIES}
81 ${PROCESS_CPP_LIBRARIES}
82 )
83@@ -163,6 +161,7 @@
84 ${CMAKE_THREAD_LIBS_INIT}
85 ${Boost_LIBRARIES}
86 ${DBUS_LIBRARIES}
87+ ${GMOCK_LIBRARIES}
88 ${GTEST_BOTH_LIBRARIES}
89 )
90
91@@ -175,6 +174,7 @@
92 ${CMAKE_THREAD_LIBS_INIT}
93 ${Boost_LIBRARIES}
94 ${DBUS_LIBRARIES}
95+ ${GMOCK_LIBRARIES}
96 ${GTEST_BOTH_LIBRARIES}
97 )
98
99@@ -187,6 +187,7 @@
100 ${CMAKE_THREAD_LIBS_INIT}
101 ${Boost_LIBRARIES}
102 ${DBUS_LIBRARIES}
103+ ${GMOCK_LIBRARIES}
104 ${GTEST_BOTH_LIBRARIES}
105 )
106
107@@ -201,6 +202,7 @@
108 ${DBUS_LIBRARIES}
109 ${LIBXML2_LIBRARIES}
110 ${GMOCK_LIBRARY}
111+ ${GMOCK_LIBRARIES}
112 ${GTEST_BOTH_LIBRARIES}
113 )
114
115@@ -213,6 +215,7 @@
116 ${CMAKE_THREAD_LIBS_INIT}
117 ${Boost_LIBRARIES}
118 ${DBUS_LIBRARIES}
119+ ${GMOCK_LIBRARIES}
120 ${GTEST_BOTH_LIBRARIES}
121 )
122
123@@ -225,6 +228,7 @@
124 ${CMAKE_THREAD_LIBS_INIT}
125 ${Boost_LIBRARIES}
126 ${DBUS_LIBRARIES}
127+ ${GMOCK_LIBRARIES}
128 ${GTEST_BOTH_LIBRARIES}
129 )
130
131@@ -237,6 +241,7 @@
132 ${CMAKE_THREAD_LIBS_INIT}
133 ${Boost_LIBRARIES}
134 ${DBUS_LIBRARIES}
135+ ${GMOCK_LIBRARIES}
136 ${GTEST_BOTH_LIBRARIES}
137 )
138
139@@ -249,6 +254,7 @@
140 ${CMAKE_THREAD_LIBS_INIT}
141 ${Boost_LIBRARIES}
142 ${DBUS_LIBRARIES}
143+ ${GMOCK_LIBRARIES}
144 ${GTEST_BOTH_LIBRARIES}
145 )
146
147@@ -261,6 +267,7 @@
148 ${CMAKE_THREAD_LIBS_INIT}
149 ${Boost_LIBRARIES}
150 ${DBUS_LIBRARIES}
151+ ${GMOCK_LIBRARIES}
152 ${GTEST_BOTH_LIBRARIES}
153 )
154
155@@ -273,6 +280,7 @@
156 ${CMAKE_THREAD_LIBS_INIT}
157 ${Boost_LIBRARIES}
158 ${DBUS_LIBRARIES}
159+ ${GMOCK_LIBRARIES}
160 ${GTEST_BOTH_LIBRARIES}
161 )
162
163@@ -284,6 +292,7 @@
164 ${CMAKE_THREAD_LIBS_INIT}
165 ${Boost_LIBRARIES}
166 ${DBUS_LIBRARIES}
167+ ${GMOCK_LIBRARIES}
168 ${GTEST_BOTH_LIBRARIES}
169 )
170
171@@ -295,6 +304,7 @@
172 ${CMAKE_THREAD_LIBS_INIT}
173 ${Boost_LIBRARIES}
174 ${DBUS_LIBRARIES}
175+ ${GMOCK_LIBRARIES}
176 ${GTEST_BOTH_LIBRARIES}
177 )
178
179
180=== modified file 'tests/service_test.cpp'
181--- tests/service_test.cpp 2014-07-30 16:12:16 +0000
182+++ tests/service_test.cpp 2017-10-31 19:10:08 +0000
183@@ -134,7 +134,7 @@
184 });
185
186 auto readonly_property = stub->get_property<test::Service::Properties::ReadOnly>();
187- EXPECT_EQ(readonly_property->get(), 7);
188+ EXPECT_EQ(readonly_property->get(), (std::uint32_t)7);
189 std::uint32_t changed_value = 0;
190 readonly_property->changed().connect([&changed_value](std::uint32_t value){
191 changed_value = value;

Subscribers

People subscribed via source and target branches