1
=== modified file 'benchmarks/frame-uniformity/CMakeLists.txt'
2
--- benchmarks/frame-uniformity/CMakeLists.txt	2017-08-25 06:41:20 +0000
3
+++ benchmarks/frame-uniformity/CMakeLists.txt	2017-10-16 14:07:35 +0000
4
@@ -28,7 +28,7 @@
5
28
  mirserver
28
  mirserver
6
29
  mirclient
29
  mirclient
7
30
  mirplatform
30
  mirplatform
9
31
  
31
10
32
  mir-test-assist
32
  mir-test-assist
11
33
33
12
34
  # needed for fake_event_hub_server_configuration.h (which relies on private APIs)
34
  # needed for fake_event_hub_server_configuration.h (which relies on private APIs)
13
@@ -39,7 +39,6 @@
14
39
39
15
40
  ${Boost_LIBRARIES}
40
  ${Boost_LIBRARIES}
16
41
  ${GTEST_BOTH_LIBRARIES}
41
  ${GTEST_BOTH_LIBRARIES}
19
42
  ${GMOCK_LIBRARY}
42
  ${GMOCK_LIBRARIES}
18
43
  ${GMOCK_MAIN_LIBRARY}
20
44
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
43
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
21
45
)
44
)
22
46
45
23
=== modified file 'cmake/FindGtestGmock.cmake'
24
--- cmake/FindGtestGmock.cmake	2017-09-07 05:58:13 +0000
25
+++ cmake/FindGtestGmock.cmake	2017-10-16 14:07:35 +0000
26
@@ -1,6 +1,12 @@
27
1
include(ExternalProject)
1
include(ExternalProject)
28
2
include(FindPackageHandleStandardArgs)
2
include(FindPackageHandleStandardArgs)
29
3
3
30
4
if (NOT MIR_CHROOT)
31
5
  find_package(GMock REQUIRED)
32
6
  if (NOT TARGET GMock)
33
7
    add_custom_target(GMock DEPENDS gmock)
34
8
  endif()
35
9
else()
36
4
#
10
#
37
5
# When cross compiling MIR_CHROOT points to our chroot.
11
# When cross compiling MIR_CHROOT points to our chroot.
38
6
# When not cross compiling, it should be blank to use the host system.
12
# When not cross compiling, it should be blank to use the host system.
39
@@ -89,8 +95,9 @@
40
89
set(GTEST_LIBRARY ${GTEST_BINARY_DIR}/libgtest.a)
95
set(GTEST_LIBRARY ${GTEST_BINARY_DIR}/libgtest.a)
41
90
set(GTEST_MAIN_LIBRARY ${GTEST_BINARY_DIR}/libgtest_main.a)
96
set(GTEST_MAIN_LIBRARY ${GTEST_BINARY_DIR}/libgtest_main.a)
42
91
set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
97
set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
44
92
set(GTEST_ALL_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
98
set(GMOCK_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
45
93
99
46
94
find_package_handle_standard_args(GTest  DEFAULT_MSG
100
find_package_handle_standard_args(GTest  DEFAULT_MSG
47
95
                                    GMOCK_INCLUDE_DIR
101
                                    GMOCK_INCLUDE_DIR
48
96
                                    GTEST_INCLUDE_DIR)
102
                                    GTEST_INCLUDE_DIR)
49
103
endif()
50
97
104
51
=== modified file 'debian/control'
52
--- debian/control	2017-10-11 15:49:20 +0000
53
+++ debian/control	2017-10-16 14:07:35 +0000
54
@@ -4,6 +4,7 @@
55
4
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
4
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
56
5
XSBC-Original-Maintainer: Thomas Voß <thomas.voss@canonical.com>
5
XSBC-Original-Maintainer: Thomas Voß <thomas.voss@canonical.com>
57
6
Build-Depends: cmake,
6
Build-Depends: cmake,
58
7
               cmake-extras,
59
7
               pkg-config,
8
               pkg-config,
60
8
               debhelper (>= 9),
9
               debhelper (>= 9),
61
9
               doxygen,
10
               doxygen,
62
10
11
63
=== modified file 'tests/CMakeLists.txt'
64
--- tests/CMakeLists.txt	2017-09-18 10:57:00 +0000
65
+++ tests/CMakeLists.txt	2017-10-16 14:07:35 +0000
66
@@ -109,9 +109,9 @@
67
109
  mir-test-doubles-platform-static
109
  mir-test-doubles-platform-static
68
110
  ${Boost_LIBRARIES}
110
  ${Boost_LIBRARIES}
69
111
  ${GTEST_BOTH_LIBRARIES}
111
  ${GTEST_BOTH_LIBRARIES}
70
112
  ${GMOCK_LIBRARY}
71
113
PRIVATE
112
PRIVATE
72
114
  ${GMOCK_MAIN_LIBRARY}
113
  ${GMOCK_MAIN_LIBRARY}
73
114
  ${GMOCK_LIBRARIES}
74
115
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
115
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
75
116
)
116
)
76
117
117
77
118
118
78
=== modified file 'tests/integration-tests/CMakeLists.txt'
79
--- tests/integration-tests/CMakeLists.txt	2017-08-25 06:41:20 +0000
80
+++ tests/integration-tests/CMakeLists.txt	2017-10-16 14:07:35 +0000
81
@@ -69,8 +69,7 @@
82
69
69
83
70
  ${Boost_LIBRARIES}
70
  ${Boost_LIBRARIES}
84
71
  ${GTEST_BOTH_LIBRARIES}
71
  ${GTEST_BOTH_LIBRARIES}
87
72
  ${GMOCK_LIBRARY}
72
  ${GMOCK_LIBRARIES}
86
73
  ${GMOCK_MAIN_LIBRARY}
88
74
  # Mesa platform dependencies
73
  # Mesa platform dependencies
89
75
  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
74
  ${DRM_LDFLAGS} ${DRM_LIBRARIES}
90
76
  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
75
  ${GBM_LDFLAGS} ${GBM_LIBRARIES}
91
77
76
92
=== modified file 'tests/mir_test_doubles/CMakeLists.txt'
93
--- tests/mir_test_doubles/CMakeLists.txt	2017-08-25 06:41:20 +0000
94
+++ tests/mir_test_doubles/CMakeLists.txt	2017-10-16 14:07:35 +0000
95
@@ -86,7 +86,7 @@
96
86
  mirserver
86
  mirserver
97
87
87
98
88
  ${Boost_LIBRARIES}
88
  ${Boost_LIBRARIES}
100
89
  ${GMOCK_LIBRARY}
89
  ${GMOCK_LIBRARIES}
101
90
  ${GMOCK_MAIN_LIBRARY}
90
  ${GMOCK_MAIN_LIBRARY}
102
91
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
91
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
103
92
)
92
)
104
@@ -104,7 +104,7 @@
105
104
  mir-test-doubles-platform-static
104
  mir-test-doubles-platform-static
106
105
105
107
106
  -ldl
106
  -ldl
109
107
  ${GMOCK_LIBRARY}
107
  ${GMOCK_LIBRARIES}
110
108
  ${GMOCK_MAIN_LIBRARY}
108
  ${GMOCK_MAIN_LIBRARY}
111
109
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
109
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
112
110
)
110
)
113
111
111
114
=== modified file 'tests/mir_test_framework/CMakeLists.txt'
115
--- tests/mir_test_framework/CMakeLists.txt	2017-09-25 13:39:41 +0000
116
+++ tests/mir_test_framework/CMakeLists.txt	2017-10-16 14:07:35 +0000
117
@@ -85,11 +85,11 @@
118
85
85
119
86
target_link_libraries(mir-test-framework-static
86
target_link_libraries(mir-test-framework-static
120
87
87
121
88
  mirserver
122
88
  mirclient
89
  mirclient
123
89
  ${Boost_LIBRARIES}
90
  ${Boost_LIBRARIES}
124
90
  ${GTEST_BOTH_LIBRARIES}
91
  ${GTEST_BOTH_LIBRARIES}
127
91
  ${GMOCK_LIBRARY}
92
  ${GMOCK_LIBRARIES}
126
92
  ${GMOCK_MAIN_LIBRARY}
128
93
  ${UMOCKDEV_LIBRARIES}
93
  ${UMOCKDEV_LIBRARIES}
129
94
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
94
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
130
95
)
95
)
131
96
96
132
=== modified file 'tests/performance-tests/CMakeLists.txt'
133
--- tests/performance-tests/CMakeLists.txt	2017-09-18 10:57:00 +0000
134
+++ tests/performance-tests/CMakeLists.txt	2017-10-16 14:07:35 +0000
135
@@ -28,8 +28,8 @@
136
28
  test_compositor.cpp
28
  test_compositor.cpp
137
29
)
29
)
138
30
target_link_libraries(mir_compositor_performance_test
30
target_link_libraries(mir_compositor_performance_test
139
31
  mir_system_performance_test
140
31
  ${GTEST_BOTH_LIBRARIES}
32
  ${GTEST_BOTH_LIBRARIES}
141
32
  mir_system_performance_test
142
33
)
33
)
143
34
34
144
35
mir_add_wrapped_executable(mir_client_startup_performance_test
35
mir_add_wrapped_executable(mir_client_startup_performance_test
145
36
36
146
=== modified file 'tests/unit-tests/CMakeLists.txt'
147
--- tests/unit-tests/CMakeLists.txt	2017-09-07 05:58:13 +0000
148
+++ tests/unit-tests/CMakeLists.txt	2017-10-16 14:07:35 +0000
149
@@ -136,8 +136,7 @@
150
136
136
151
137
  ${PROTOBUF_LITE_LIBRARIES}
137
  ${PROTOBUF_LITE_LIBRARIES}
152
138
  ${GTEST_BOTH_LIBRARIES}
138
  ${GTEST_BOTH_LIBRARIES}
155
139
  ${GMOCK_LIBRARY}
139
  ${GMOCK_LIBRARIES}
154
140
  ${GMOCK_MAIN_LIBRARY}
156
141
  ${Boost_LIBRARIES}
140
  ${Boost_LIBRARIES}
157
142
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
141
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
158
143
)
142
)
159
@@ -176,8 +175,7 @@
160
176
175
161
177
  ${PROTOBUF_LITE_LIBRARIES}
176
  ${PROTOBUF_LITE_LIBRARIES}
162
178
  ${GTEST_BOTH_LIBRARIES}
177
  ${GTEST_BOTH_LIBRARIES}
165
179
  ${GMOCK_LIBRARY}
178
  ${GMOCK_LIBRARIES}
164
180
  ${GMOCK_MAIN_LIBRARY}
166
181
  ${Boost_LIBRARIES}
179
  ${Boost_LIBRARIES}
167
182
  ${UMOCKDEV_LIBRARIES}
180
  ${UMOCKDEV_LIBRARIES}
168
183
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
181
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
169
184
182
170
=== modified file 'tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp'
171
--- tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp	2017-08-25 06:41:20 +0000
172
+++ tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp	2017-10-16 14:07:35 +0000
173
@@ -155,7 +155,7 @@
174
155
    auto edid_size = mir_output_get_edid_size(output);
155
    auto edid_size = mir_output_get_edid_size(output);
175
156
156
176
157
    ASSERT_NE(nullptr, edid_start);
157
    ASSERT_NE(nullptr, edid_start);
178
158
    ASSERT_NE(0, edid_size);
158
    ASSERT_NE(0u, edid_size);
179
159
159
180
160
    std::vector<uint8_t> host_edid(edid_start, edid_start+edid_size);
160
    std::vector<uint8_t> host_edid(edid_start, edid_start+edid_size);
181
161
161
Status:	Superseded
Proposed branch:	lp:~alan-griffiths/mir/fix-gmock-detection
Merge into:	lp:mir
Diff against target:	180 lines (+21/-17) 10 files modified benchmarks/frame-uniformity/CMakeLists.txt (+2/-3) cmake/FindGtestGmock.cmake (+8/-1) debian/control (+1/-0) tests/CMakeLists.txt (+1/-1) tests/integration-tests/CMakeLists.txt (+1/-2) tests/mir_test_doubles/CMakeLists.txt (+2/-2) tests/mir_test_framework/CMakeLists.txt (+2/-2) tests/performance-tests/CMakeLists.txt (+1/-1) tests/unit-tests/CMakeLists.txt (+2/-4) tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp (+1/-1)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/fix-gmock-detection
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Needs Fixing on 2017-10-16
Mir development team		2017-10-16	Pending
Review via email: mp+332285@code.launchpad.net