QtMir

Merge lp:~aacid/qtmir/system_includes into lp:qtmir

  1. system_includes
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michael Terry
Approved revision: 520
Merged at revision: 531
Proposed branch: lp:~aacid/qtmir/system_includes
Merge into: lp:qtmir
Prerequisite: lp:~dandrader/qtmir/mirSurfaceInputBounds
Diff against target: 364 lines (+98/-23)
18 files modified
CMakeLists.txt (+6/-5)
debian/changelog (+25/-0)
demos/qml-demo-client/CMakeLists.txt (+3/-6)
demos/qml-demo-shell/CMakeLists.txt (+3/-6)
src/modules/Unity/Application/CMakeLists.txt (+6/-2)
src/modules/Unity/Screens/CMakeLists.txt (+4/-0)
src/platforms/mirserver/CMakeLists.txt (+4/-0)
tests/framework/CMakeLists.txt (+5/-1)
tests/mirserver/Clipboard/CMakeLists.txt (+4/-0)
tests/mirserver/QtEventFeeder/CMakeLists.txt (+4/-0)
tests/mirserver/Screen/CMakeLists.txt (+4/-0)
tests/mirserver/ScreensModel/CMakeLists.txt (+4/-0)
tests/mirserver/WindowManager/CMakeLists.txt (+4/-0)
tests/modules/Application/CMakeLists.txt (+4/-1)
tests/modules/ApplicationManager/CMakeLists.txt (+5/-1)
tests/modules/SessionManager/CMakeLists.txt (+5/-1)
tests/modules/SharedWakelock/CMakeLists.txt (+4/-0)
tests/modules/SurfaceManager/CMakeLists.txt (+4/-0)
To merge this branch: bzr merge lp:~aacid/qtmir/system_includes
Reviewer Review Type Date Requested Status
Unity8 CI Bot (community) continuous-integration Needs Fixing
Michael Terry (community) Approve
Gerry Boland Pending
Review via email: mp+300208@code.launchpad.net

This proposal supersedes a proposal from 2016-06-06.

Commit message

Mark system includes as such

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
Prereq

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote : Posted in a previous version of this proposal

Cool, thanks!!

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:518
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/262/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1886/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1912
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1848
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1848
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1848
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1839/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1839/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1839/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1839/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1839/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1839/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1839/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1839/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1839/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/262/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:519
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/266/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1893/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1919
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1855
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1855
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1855
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1846/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1846/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1846/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1846/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1846/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1846/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1846/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1846/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1846/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/266/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote : Posted in a previous version of this proposal

This should be good. CI unhappy only as this based on the contents of the latest silo, which has a newer unity-api

Revision history for this message
Michael Terry (mterry) wrote :

I'm just re-approving after a rebase.

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:520
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/308/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2303/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2331
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2231
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2231
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2231
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2224/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2224/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2224/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2224/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2224/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2224/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2224/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2224/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2224/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/308/rebuild

review: Needs Fixing (continuous-integration)

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 2016-07-15 15:21:57 +0000
3+++ CMakeLists.txt 2016-07-15 15:21:57 +0000
4@@ -86,19 +86,20 @@
5 pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=19)
6 pkg_check_modules(CGMANAGER libcgmanager REQUIRED)
7
8+include_directories(SYSTEM ${APPLICATION_API_INCLUDE_DIRS})
9+
10+
11 add_definitions(-DMIR_REQUIRE_DEPRECATED_EVENT_OPT_IN=1)
12
13 # Use the fast string builder
14 add_definitions(-DQT_USE_QSTRINGBUILDER)
15
16-include_directories( ${APPLICATION_API_INCLUDE_DIRS} )
17-
18 # We expect this to be set via debian/rules for GLES builds
19 if ("${USE_OPENGLES}" STREQUAL 1)
20 message(STATUS "Qt5 determined to be compiled with GLES support")
21 pkg_check_modules(GLESv2 glesv2)
22 add_definitions(-DQT_USING_GLES)
23- include_directories (${GLESv2_INCLUDE_DIRS})
24+ include_directories (SYSTEM ${GLESv2_INCLUDE_DIRS})
25 set (GL_LIBRARIES "${GLESv2_LIBRARIES}")
26 # Because qt/gl and qt/gles are not parallel installable we have a difficulty
27 # building qtmir-desktop on armhf. We would like to link against opengl and bind the
28@@ -109,13 +110,13 @@
29 message(STATUS "Linking against OpenGL ES but binding OpenGL API")
30 pkg_check_modules(GLESv2 glesv2)
31 add_definitions(-DQT_USING_GL)
32- include_directories (${GLESv2_INCLUDE_DIRS})
33+ include_directories (SYSTEM ${GLESv2_INCLUDE_DIRS})
34 set (GL_LIBRARIES "${GLESv2_LIBRARIES}")
35 else()
36 message(STATUS "Qt5 determined to be compiled with OpenGL support")
37 pkg_check_modules(GL gl)
38 add_definitions(-DQT_USING_OPENGL)
39- include_directories (${GL_INCLUDE_DIRS})
40+ include_directories (SYSTEM ${GL_INCLUDE_DIRS})
41 endif()
42
43 # Standard install paths
44
45=== modified file 'debian/changelog'
46--- debian/changelog 2016-07-12 13:39:51 +0000
47+++ debian/changelog 2016-07-15 15:21:57 +0000
48@@ -49,6 +49,31 @@
49
50 -- Albert Astals Cid <albert.astals@canonical.com> Tue, 14 Jun 2016 08:38:00 +0000
51
52+qtmir (0.4.8+16.10.20160606.1-0ubuntu1) yakkety; urgency=medium
53+
54+ [ Albert Astals Cid ]
55+ * Add support for compiler sanitizers via ECM
56+ * Compile with -fsanitize=undefined
57+ * Fix leak in ScreensModelTest (LP: #1585502)
58+ * Fix leak in SessionManager test (LP: #1585498)
59+ * Remove unused m_sessions member
60+ * Add missing breaks
61+ * Initialize m_lastX and m_lastY
62+ * Initialize m_sessionId
63+ * Give the locker a name
64+ * Fix memory leak in QtEventFeederTest (LP: #1585503)
65+ * Fix leaks in application_manager_test (LP: #1585501)
66+
67+ [ Daniel d'Andrada ]
68+ * Improve Session debug logging
69+ * MirSurfaceListModel: prepending a surface always causes
70+ firstChanged() emission
71+
72+ [ Michael Zanetti ]
73+ * Adding ApplicationInfo::surfaceCount property
74+
75+ -- Michał Sawicz <michal.sawicz@canonical.com> Mon, 06 Jun 2016 15:45:57 +0000
76+
77 qtmir (0.4.8+16.10.20160602-0ubuntu1) yakkety; urgency=medium
78
79 * rebuild for mir 0.23
80
81=== modified file 'demos/qml-demo-client/CMakeLists.txt'
82--- demos/qml-demo-client/CMakeLists.txt 2015-09-01 16:16:47 +0000
83+++ demos/qml-demo-client/CMakeLists.txt 2016-07-15 15:21:57 +0000
84@@ -2,19 +2,16 @@
85 configure_file(${DEMO_CLIENT}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${DEMO_CLIENT}.desktop @ONLY)
86
87 include_directories(
88+ SYSTEM
89 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
90+ ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
91+ ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
92 )
93
94 add_executable(${DEMO_CLIENT}
95 main.cpp
96 )
97
98-include_directories(
99- ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
100- ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
101- ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
102-)
103-
104 target_link_libraries(
105 ${DEMO_CLIENT}
106 Qt5::Core
107
108=== modified file 'demos/qml-demo-shell/CMakeLists.txt'
109--- demos/qml-demo-shell/CMakeLists.txt 2015-09-01 16:16:47 +0000
110+++ demos/qml-demo-shell/CMakeLists.txt 2016-07-15 15:21:57 +0000
111@@ -1,19 +1,16 @@
112 set(DEMO_SHELL qtmir-demo-shell)
113
114 include_directories(
115+ SYSTEM
116 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
117+ ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
118+ ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
119 )
120
121 add_executable(${DEMO_SHELL}
122 main.cpp
123 )
124
125-include_directories(
126- ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
127- ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
128- ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
129-)
130-
131 target_link_libraries(
132 ${DEMO_SHELL}
133 Qt5::Core
134
135=== modified file 'src/modules/Unity/Application/CMakeLists.txt'
136--- src/modules/Unity/Application/CMakeLists.txt 2016-07-15 15:21:57 +0000
137+++ src/modules/Unity/Application/CMakeLists.txt 2016-07-15 15:21:57 +0000
138@@ -1,4 +1,10 @@
139 include_directories(
140+ ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
141+ ${CMAKE_SOURCE_DIR}/src/common
142+)
143+
144+include_directories(
145+ SYSTEM
146 ${GLIB_INCLUDE_DIRS}
147 ${GIO_INCLUDE_DIRS}
148 ${GIO_UNIX_INCLUDE_DIRS}
149@@ -7,8 +13,6 @@
150 ${PROCESS_CPP_INCLUDE_DIRS}
151 ${UBUNTU_PLATFORM_API_INCLUDE_DIRS}
152 ${UBUNTU_APP_LAUNCH_INCLUDE_DIRS}
153- ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
154- ${CMAKE_SOURCE_DIR}/src/common
155 ${GSETTINGS_QT_INCLUDE_DIRS}
156 ${CGMANAGER_INCLUDE_DIRS}
157
158
159=== modified file 'src/modules/Unity/Screens/CMakeLists.txt'
160--- src/modules/Unity/Screens/CMakeLists.txt 2016-01-28 22:33:35 +0000
161+++ src/modules/Unity/Screens/CMakeLists.txt 2016-07-15 15:21:57 +0000
162@@ -1,5 +1,9 @@
163 include_directories(
164 ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
165+)
166+
167+include_directories(
168+ SYSTEM
169 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
170 ${Qt5Quick_INCLUDE_DIRS}
171 ${MIRSERVER_INCLUDE_DIRS}
172
173=== modified file 'src/platforms/mirserver/CMakeLists.txt'
174--- src/platforms/mirserver/CMakeLists.txt 2016-06-14 08:33:55 +0000
175+++ src/platforms/mirserver/CMakeLists.txt 2016-07-15 15:21:57 +0000
176@@ -26,6 +26,10 @@
177 include_directories(
178 ${CMAKE_SOURCE_DIR}/src/common
179
180+)
181+
182+include_directories(
183+ SYSTEM
184 ${MIRCOMMON_INCLUDE_DIRS}
185 ${MIRSERVER_INCLUDE_DIRS}
186 ${MIRRENDERERGLDEV_INCLUDE_DIRS}
187
188=== modified file 'tests/framework/CMakeLists.txt'
189--- tests/framework/CMakeLists.txt 2016-05-24 20:13:10 +0000
190+++ tests/framework/CMakeLists.txt 2016-07-15 15:21:57 +0000
191@@ -1,7 +1,11 @@
192 include_directories(
193- ${APPLICATION_API_INCLUDE_DIRS}
194 ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
195 ${CMAKE_SOURCE_DIR}/src/modules
196+)
197+
198+include_directories(
199+ SYSTEM
200+ ${APPLICATION_API_INCLUDE_DIRS}
201 ${MIRSERVER_INCLUDE_DIRS}
202 ${MIRRENDERERGLDEV_INCLUDE_DIRS}
203
204
205=== modified file 'tests/mirserver/Clipboard/CMakeLists.txt'
206--- tests/mirserver/Clipboard/CMakeLists.txt 2014-12-03 08:56:35 +0000
207+++ tests/mirserver/Clipboard/CMakeLists.txt 2016-07-15 15:21:57 +0000
208@@ -6,6 +6,10 @@
209
210 include_directories(
211 ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
212+)
213+
214+include_directories(
215+ SYSTEM
216 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
217 ${MIRSERVER_INCLUDE_DIRS}
218 )
219
220=== modified file 'tests/mirserver/QtEventFeeder/CMakeLists.txt'
221--- tests/mirserver/QtEventFeeder/CMakeLists.txt 2014-12-03 08:56:35 +0000
222+++ tests/mirserver/QtEventFeeder/CMakeLists.txt 2016-07-15 15:21:57 +0000
223@@ -7,6 +7,10 @@
224 include_directories(
225 ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
226 ${CMAKE_SOURCE_DIR}/src/common
227+)
228+
229+include_directories(
230+ SYSTEM
231 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
232 ${MIRSERVER_INCLUDE_DIRS}
233 )
234
235=== modified file 'tests/mirserver/Screen/CMakeLists.txt'
236--- tests/mirserver/Screen/CMakeLists.txt 2015-11-11 10:43:36 +0000
237+++ tests/mirserver/Screen/CMakeLists.txt 2016-07-15 15:21:57 +0000
238@@ -8,6 +8,10 @@
239 ${CMAKE_SOURCE_DIR}/tests/framework
240 ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
241 ${CMAKE_SOURCE_DIR}/src/common
242+)
243+
244+include_directories(
245+ SYSTEM
246 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
247 ${MIRSERVER_INCLUDE_DIRS}
248 )
249
250=== modified file 'tests/mirserver/ScreensModel/CMakeLists.txt'
251--- tests/mirserver/ScreensModel/CMakeLists.txt 2016-02-16 11:48:35 +0000
252+++ tests/mirserver/ScreensModel/CMakeLists.txt 2016-07-15 15:21:57 +0000
253@@ -11,6 +11,10 @@
254 ${CMAKE_SOURCE_DIR}/tests/framework
255 ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
256 ${CMAKE_SOURCE_DIR}/src/common
257+)
258+
259+include_directories(
260+ SYSTEM
261 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
262 ${MIRSERVER_INCLUDE_DIRS}
263 ${MIRRENDERERGLDEV_INCLUDE_DIRS}
264
265=== modified file 'tests/mirserver/WindowManager/CMakeLists.txt'
266--- tests/mirserver/WindowManager/CMakeLists.txt 2016-03-10 11:55:28 +0000
267+++ tests/mirserver/WindowManager/CMakeLists.txt 2016-07-15 15:21:57 +0000
268@@ -1,5 +1,9 @@
269 include_directories(
270 ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
271+)
272+
273+include_directories(
274+ SYSTEM
275 ${MIRSERVER_INCLUDE_DIRS}
276 )
277
278
279=== modified file 'tests/modules/Application/CMakeLists.txt'
280--- tests/modules/Application/CMakeLists.txt 2015-12-15 10:03:32 +0000
281+++ tests/modules/Application/CMakeLists.txt 2016-07-15 15:21:57 +0000
282@@ -7,8 +7,11 @@
283 ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
284 ${CMAKE_SOURCE_DIR}/src/modules
285 ${CMAKE_SOURCE_DIR}/tests/framework
286+)
287+
288+include_directories(
289+ SYSTEM
290 ${MIRSERVER_INCLUDE_DIRS}
291-
292 ${Qt5Core_INCLUDE_DIRS}
293 ${Qt5GUI_INCLUDE_DIRS}
294 ${Qt5Quick_INCLUDE_DIRS}
295
296=== modified file 'tests/modules/ApplicationManager/CMakeLists.txt'
297--- tests/modules/ApplicationManager/CMakeLists.txt 2015-09-30 15:45:17 +0000
298+++ tests/modules/ApplicationManager/CMakeLists.txt 2016-07-15 15:21:57 +0000
299@@ -5,10 +5,14 @@
300 )
301
302 include_directories(
303- ${APPLICATION_API_INCLUDE_DIRS}
304 ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
305 ${CMAKE_SOURCE_DIR}/src/modules
306 ${CMAKE_SOURCE_DIR}/tests/framework
307+)
308+
309+include_directories(
310+ SYSTEM
311+ ${APPLICATION_API_INCLUDE_DIRS}
312 ${MIRSERVER_INCLUDE_DIRS}
313 )
314
315
316=== modified file 'tests/modules/SessionManager/CMakeLists.txt'
317--- tests/modules/SessionManager/CMakeLists.txt 2015-09-30 15:45:17 +0000
318+++ tests/modules/SessionManager/CMakeLists.txt 2016-07-15 15:21:57 +0000
319@@ -6,10 +6,14 @@
320 )
321
322 include_directories(
323- ${APPLICATION_API_INCLUDE_DIRS}
324 ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
325 ${CMAKE_SOURCE_DIR}/src/modules
326 ${CMAKE_SOURCE_DIR}/tests/framework
327+)
328+
329+include_directories(
330+ SYSTEM
331+ ${APPLICATION_API_INCLUDE_DIRS}
332 ${MIRSERVER_INCLUDE_DIRS}
333 )
334
335
336=== modified file 'tests/modules/SharedWakelock/CMakeLists.txt'
337--- tests/modules/SharedWakelock/CMakeLists.txt 2015-09-30 15:45:17 +0000
338+++ tests/modules/SharedWakelock/CMakeLists.txt 2016-07-15 15:21:57 +0000
339@@ -5,6 +5,10 @@
340
341 include_directories(
342 ${CMAKE_SOURCE_DIR}/src/modules
343+)
344+
345+include_directories(
346+ SYSTEM
347 ${QTDBUSTEST_INCLUDE_DIRS}
348 ${QTDBUSMOCK_INCLUDE_DIRS}
349 )
350
351=== modified file 'tests/modules/SurfaceManager/CMakeLists.txt'
352--- tests/modules/SurfaceManager/CMakeLists.txt 2016-05-24 20:13:10 +0000
353+++ tests/modules/SurfaceManager/CMakeLists.txt 2016-07-15 15:21:57 +0000
354@@ -9,6 +9,10 @@
355 ${CMAKE_SOURCE_DIR}/src/modules
356 ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
357 ${CMAKE_SOURCE_DIR}/tests/framework
358+)
359+
360+include_directories(
361+ SYSTEM
362 ${MIRSERVER_INCLUDE_DIRS}
363 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
364 )

Subscribers

People subscribed via source and target branches