Unity

Merge lp:~jpakkane/unity/build-fixes2 into lp:unity

  1. build-fixes2
  2. Merge into trunk
Proposed by Jussi Pakkanen
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 2934
Proposed branch: lp:~jpakkane/unity/build-fixes2
Merge into: lp:unity
Diff against target: 571 lines (+35/-46)
32 files modified
UnityCore/CMakeLists.txt (+1/-2)
dash/CMakeLists.txt (+1/-4)
dash/FilterAllButton.cpp (+1/-0)
dash/FilterGenreWidget.cpp (+1/-0)
dash/FilterMultiRangeWidget.cpp (+1/-0)
dash/FilterRatingsWidget.cpp (+1/-0)
dash/LensView.cpp (+1/-0)
dash/PlacesGroup.cpp (+1/-0)
dash/previews/ApplicationPreview.cpp (+2/-1)
dash/previews/CMakeLists.txt (+1/-7)
dash/previews/PreviewRatingsWidget.cpp (+1/-0)
dash/previews/SocialPreview.cpp (+2/-0)
hud/CMakeLists.txt (+1/-4)
hud/HudView.cpp (+1/-0)
launcher/BFBLauncherIcon.cpp (+1/-0)
launcher/CMakeLists.txt (+1/-5)
launcher/DesktopLauncherIcon.cpp (+1/-0)
launcher/DeviceNotificationDisplayImp.cpp (+1/-0)
launcher/ExpoLauncherIcon.cpp (+1/-0)
launcher/LauncherController.cpp (+1/-0)
launcher/SoftwareCenterLauncherIcon.cpp (+1/-0)
launcher/TrashLauncherIcon.cpp (+1/-0)
launcher/VolumeLauncherIcon.cpp (+1/-0)
panel/CMakeLists.txt (+1/-4)
panel/PanelMenuView.cpp (+1/-0)
services/CMakeLists.txt (+1/-2)
shortcuts/CMakeLists.txt (+1/-4)
shortcuts/ShortcutHintPrivate.cpp (+1/-0)
shortcuts/StandaloneShortcuts.cpp (+1/-0)
unity-shared/CMakeLists.txt (+1/-3)
unity-shared/TextInput.h (+2/-1)
unity-standalone/CMakeLists.txt (+1/-9)
To merge this branch: bzr merge lp:~jpakkane/unity/build-fixes2
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Stephen M. Webb (community) Needs Fixing
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+130329@code.launchpad.net

Commit message

More build fixes.

Description of the change

Second set of build fixes. This has three separate fixes.

1. GETTEXT_PACKAGE is defined in two different places: config.h and as a command line argument that is given to every single compiler invocation. Only use the first one and even then only when it is actually used.

2. Some include directories were (multiply) defined with add_definitions(-Isomething). Get rid of them all.

3. Removed current source directory from include paths. It was added twice for each directory and both were unnecessary, since the source directory is in the search path by default.

To post a comment you must log in.
Revision history for this message
Jussi Pakkanen (jpakkane) wrote :

There was a fourth one as well. There were a lot of constructs like this:

target_link_library(foo bar)
add_dependency(foo bar)

The latter is unnecessary, target_link_library sets up the dependency automatically. Removed the extra definitions.

Revision history for this message
Jussi Pakkanen (jpakkane) wrote :

A review please? This still applies cleanly and is a dependency for speeding up the build with precompiled headers.

Revision history for this message
Stephen M. Webb (bregma) wrote :

Sweet.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/163/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/163/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/163/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) wrote :

Merged trunk does not build due to an order-of-includes problem. The following patch fixes it.

=== modified file 'unity-shared/TextInput.h'
--- unity-shared/TextInput.h 2012-11-22 12:53:25 +0000
+++ unity-shared/TextInput.h 2012-11-26 16:37:04 +0000
@@ -20,6 +20,8 @@
 #ifndef TEXTINPUT_H
 #define TEXTINPUT_H

+#include "config.h"
+
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>

@@ -34,7 +36,6 @@
 #include <UnityCore/GLibSource.h>
 #include <UnityCore/Variant.h>

-#include "config.h"
 #include "CairoTexture.h"
 #include "unity-shared/IconTexture.h"
 #include "unity-shared/IMTextEntry.h"

review: Needs Fixing
Revision history for this message
Jussi Pakkanen (jpakkane) wrote :

Fixed.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UnityCore/CMakeLists.txt'
2--- UnityCore/CMakeLists.txt 2012-11-14 14:54:06 +0000
3+++ UnityCore/CMakeLists.txt 2012-11-27 07:30:28 +0000
4@@ -104,12 +104,11 @@
5 # CFLAGS and LIBS
6 #
7 set (CFLAGS
8- "-I${CMAKE_BINARY_DIR}"
9- "-DGETTEXT_PACKAGE=\"unity\""
10 "-DLENSES_DIR=\"${_lensesdir}\""
11 )
12 add_definitions (${CFLAGS})
13 include_directories(${CORE_DEPS_INCLUDE_DIRS})
14+include_directories(${CMAKE_BINARY_DIR})
15
16 set (LIBS ${CORE_DEPS_LIBRARIES})
17
18
19=== modified file 'dash/CMakeLists.txt'
20--- dash/CMakeLists.txt 2012-10-17 08:46:48 +0000
21+++ dash/CMakeLists.txt 2012-11-27 07:30:28 +0000
22@@ -5,8 +5,6 @@
23 set (CFLAGS
24 ${CACHED_UNITY_DEPS_CFLAGS}
25 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
26- "-DGETTEXT_PACKAGE=\"unity\""
27- "-I${CMAKE_CURRENT_BINARY_DIR}"
28 )
29
30 if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
31@@ -22,7 +20,7 @@
32 set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
33 link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
34
35-include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
36+include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
37
38 add_subdirectory(previews)
39
40@@ -64,5 +62,4 @@
41 # Standalone variant
42 #
43 add_executable (dash StandaloneDash.cpp)
44-add_dependencies (dash dash-lib)
45 target_link_libraries (dash dash-lib unity-shared)
46
47=== modified file 'dash/FilterAllButton.cpp'
48--- dash/FilterAllButton.cpp 2012-11-19 18:54:19 +0000
49+++ dash/FilterAllButton.cpp 2012-11-27 07:30:28 +0000
50@@ -22,6 +22,7 @@
51
52
53 #include <glib.h>
54+#include "config.h"
55 #include <glib/gi18n-lib.h>
56
57 #include "FilterAllButton.h"
58
59=== modified file 'dash/FilterGenreWidget.cpp'
60--- dash/FilterGenreWidget.cpp 2012-05-06 23:48:38 +0000
61+++ dash/FilterGenreWidget.cpp 2012-11-27 07:30:28 +0000
62@@ -21,6 +21,7 @@
63 */
64
65 #include <glib.h>
66+#include "config.h"
67 #include <glib/gi18n-lib.h>
68 #include <UnityCore/GLibWrapper.h>
69
70
71=== modified file 'dash/FilterMultiRangeWidget.cpp'
72--- dash/FilterMultiRangeWidget.cpp 2012-05-06 23:48:38 +0000
73+++ dash/FilterMultiRangeWidget.cpp 2012-11-27 07:30:28 +0000
74@@ -28,6 +28,7 @@
75 #include "FilterBasicButton.h"
76
77 #include <glib.h>
78+#include "config.h"
79 #include <glib/gi18n-lib.h>
80
81 namespace unity
82
83=== modified file 'dash/FilterRatingsWidget.cpp'
84--- dash/FilterRatingsWidget.cpp 2012-05-06 23:48:38 +0000
85+++ dash/FilterRatingsWidget.cpp 2012-11-27 07:30:28 +0000
86@@ -22,6 +22,7 @@
87
88 #include <Nux/Nux.h>
89 #include <glib.h>
90+#include "config.h"
91 #include <glib/gi18n-lib.h>
92
93 #include "unity-shared/DashStyle.h"
94
95=== modified file 'dash/LensView.cpp'
96--- dash/LensView.cpp 2012-11-23 23:49:46 +0000
97+++ dash/LensView.cpp 2012-11-27 07:30:28 +0000
98@@ -35,6 +35,7 @@
99 #include "unity-shared/PlacesVScrollBar.h"
100 #include "unity-shared/PlacesOverlayVScrollBar.h"
101
102+#include "config.h"
103 #include <glib/gi18n-lib.h>
104
105 namespace unity
106
107=== modified file 'dash/PlacesGroup.cpp'
108--- dash/PlacesGroup.cpp 2012-11-19 18:54:19 +0000
109+++ dash/PlacesGroup.cpp 2012-11-27 07:30:28 +0000
110@@ -25,6 +25,7 @@
111
112 #include "PlacesGroup.h"
113 #include <glib.h>
114+#include "config.h"
115 #include <glib/gi18n-lib.h>
116
117 #include <UnityCore/Variant.h>
118
119=== modified file 'dash/previews/ApplicationPreview.cpp'
120--- dash/previews/ApplicationPreview.cpp 2012-11-13 21:42:58 +0000
121+++ dash/previews/ApplicationPreview.cpp 2012-11-27 07:30:28 +0000
122@@ -32,6 +32,8 @@
123 #include <Nux/VLayout.h>
124 #include <Nux/GridHLayout.h>
125 #include <Nux/Button.h>
126+
127+#include "config.h"
128 #include <glib/gi18n-lib.h>
129
130 #include "ApplicationPreview.h"
131@@ -39,7 +41,6 @@
132 #include "PreviewInfoHintWidget.h"
133 #include "PreviewRatingsWidget.h"
134
135-
136 namespace unity
137 {
138 namespace dash
139
140=== modified file 'dash/previews/CMakeLists.txt'
141--- dash/previews/CMakeLists.txt 2012-11-06 18:19:09 +0000
142+++ dash/previews/CMakeLists.txt 2012-11-27 07:30:28 +0000
143@@ -5,8 +5,6 @@
144 set (CFLAGS
145 ${CACHED_UNITY_DEPS_CFLAGS}
146 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
147- "-DGETTEXT_PACKAGE=\"unity\""
148- "-I${CMAKE_CURRENT_BINARY_DIR}"
149 )
150
151 if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
152@@ -21,7 +19,7 @@
153 set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
154 link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
155
156-include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
157+include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
158
159 #
160 # Headers & Sources
161@@ -52,26 +50,22 @@
162 # Application Standalone variant
163 #
164 add_executable (app_previews StandaloneApplicationPreview.cpp)
165-add_dependencies (app_previews previews-lib)
166 target_link_libraries (app_previews previews-lib unity-shared)
167
168 #
169 # Music Standalone variant
170 #
171 add_executable (music_previews StandaloneMusicPreview.cpp)
172-add_dependencies (music_previews previews-lib)
173 target_link_libraries (music_previews previews-lib unity-shared)
174
175 #
176 # Social Standalone variant
177 #
178 add_executable (social_previews StandaloneSocialPreview.cpp)
179-add_dependencies (social_previews previews-lib)
180 target_link_libraries (social_previews previews-lib unity-shared)
181
182 #
183 # Music Standalone variant
184 #
185 add_executable (movie_previews StandaloneMoviePreview.cpp)
186-add_dependencies (movie_previews previews-lib)
187 target_link_libraries (movie_previews previews-lib unity-shared)
188
189=== modified file 'dash/previews/PreviewRatingsWidget.cpp'
190--- dash/previews/PreviewRatingsWidget.cpp 2012-08-28 08:30:00 +0000
191+++ dash/previews/PreviewRatingsWidget.cpp 2012-11-27 07:30:28 +0000
192@@ -23,6 +23,7 @@
193 #include <Nux/Nux.h>
194 #include <Nux/VLayout.h>
195 #include <glib.h>
196+#include "config.h"
197 #include <glib/gi18n-lib.h>
198
199 #include "unity-shared/RatingsButton.h"
200
201=== modified file 'dash/previews/SocialPreview.cpp'
202--- dash/previews/SocialPreview.cpp 2012-11-13 21:42:58 +0000
203+++ dash/previews/SocialPreview.cpp 2012-11-27 07:30:28 +0000
204@@ -32,6 +32,8 @@
205 #include <Nux/VLayout.h>
206 #include <Nux/GridHLayout.h>
207 #include <Nux/Button.h>
208+
209+#include "config.h"
210 #include <glib/gi18n-lib.h>
211
212 #include "SocialPreview.h"
213
214=== modified file 'hud/CMakeLists.txt'
215--- hud/CMakeLists.txt 2012-10-17 08:46:48 +0000
216+++ hud/CMakeLists.txt 2012-11-27 07:30:28 +0000
217@@ -5,8 +5,6 @@
218 set (CFLAGS
219 ${CACHED_UNITY_DEPS_CFLAGS}
220 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
221- "-DGETTEXT_PACKAGE=\"unity\""
222- "-I${CMAKE_CURRENT_BINARY_DIR}"
223 )
224
225 if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
226@@ -22,7 +20,7 @@
227 set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
228 link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
229
230-include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
231+include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
232
233 #
234 # Headers & Sources
235@@ -44,5 +42,4 @@
236 # Standalone variant
237 #
238 add_executable (hud StandaloneHud.cpp)
239-add_dependencies (hud hud-lib)
240 target_link_libraries (hud hud-lib unity-shared)
241
242=== modified file 'hud/HudView.cpp'
243--- hud/HudView.cpp 2012-11-08 09:12:24 +0000
244+++ hud/HudView.cpp 2012-11-27 07:30:28 +0000
245@@ -20,6 +20,7 @@
246
247 #include <math.h>
248
249+#include "config.h"
250 #include <glib/gi18n-lib.h>
251 #include <NuxCore/Logger.h>
252 #include <UnityCore/GLibWrapper.h>
253
254=== modified file 'launcher/BFBLauncherIcon.cpp'
255--- launcher/BFBLauncherIcon.cpp 2012-09-20 14:58:49 +0000
256+++ launcher/BFBLauncherIcon.cpp 2012-11-27 07:30:28 +0000
257@@ -18,6 +18,7 @@
258 * Andrea Azzarone <azzaronea@gmail.com>
259 */
260
261+#include "config.h"
262 #include <glib/gi18n-lib.h>
263 #include "unity-shared/UBusMessages.h"
264
265
266=== modified file 'launcher/CMakeLists.txt'
267--- launcher/CMakeLists.txt 2012-11-15 22:53:24 +0000
268+++ launcher/CMakeLists.txt 2012-11-27 07:30:28 +0000
269@@ -6,8 +6,6 @@
270 ${CACHED_UNITY_DEPS_CFLAGS}
271 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
272 "-fPIC"
273- "-DGETTEXT_PACKAGE=\"unity\""
274- "-I${CMAKE_CURRENT_BINARY_DIR}"
275 )
276
277 if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
278@@ -23,7 +21,7 @@
279 set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
280 link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
281
282-include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
283+include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
284
285 #
286 # Headers & Sources
287@@ -103,11 +101,9 @@
288 # Standalone variant
289 #
290 add_executable (launcher StandaloneLauncher.cpp)
291-add_dependencies (launcher launcher-lib)
292 target_link_libraries (launcher launcher-lib unity-shared unity-shared-standalone)
293
294 if (ENABLE_X_SUPPORT)
295 add_executable (switcher StandaloneSwitcher.cpp)
296- add_dependencies (switcher switcher-lib launcher-lib)
297 target_link_libraries (switcher switcher-lib launcher-lib unity-shared unity-shared-standalone)
298 endif ()
299
300=== modified file 'launcher/DesktopLauncherIcon.cpp'
301--- launcher/DesktopLauncherIcon.cpp 2012-10-11 01:44:15 +0000
302+++ launcher/DesktopLauncherIcon.cpp 2012-11-27 07:30:28 +0000
303@@ -20,6 +20,7 @@
304 #include "DesktopLauncherIcon.h"
305 #include "unity-shared/WindowManager.h"
306 #include "FavoriteStore.h"
307+#include "config.h"
308
309 #include <glib/gi18n-lib.h>
310
311
312=== modified file 'launcher/DeviceNotificationDisplayImp.cpp'
313--- launcher/DeviceNotificationDisplayImp.cpp 2012-09-12 15:07:07 +0000
314+++ launcher/DeviceNotificationDisplayImp.cpp 2012-11-27 07:30:28 +0000
315@@ -18,6 +18,7 @@
316 */
317
318 #include <gdk/gdk.h>
319+#include "config.h"
320 #include <glib/gi18n-lib.h>
321 #include <libnotify/notify.h>
322 #include <sigc++/sigc++.h>
323
324=== modified file 'launcher/ExpoLauncherIcon.cpp'
325--- launcher/ExpoLauncherIcon.cpp 2012-11-06 18:19:09 +0000
326+++ launcher/ExpoLauncherIcon.cpp 2012-11-27 07:30:28 +0000
327@@ -20,6 +20,7 @@
328 #include "ExpoLauncherIcon.h"
329 #include "FavoriteStore.h"
330
331+#include "config.h"
332 #include <glib/gi18n-lib.h>
333
334 namespace unity
335
336=== modified file 'launcher/LauncherController.cpp'
337--- launcher/LauncherController.cpp 2012-11-27 01:04:19 +0000
338+++ launcher/LauncherController.cpp 2012-11-27 07:30:28 +0000
339@@ -19,6 +19,7 @@
340 * Marco Trevisan <marco.trevisan@canonical.com>
341 */
342
343+#include "config.h"
344 #include <glib/gi18n-lib.h>
345 #include <libbamf/libbamf.h>
346
347
348=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
349--- launcher/SoftwareCenterLauncherIcon.cpp 2012-10-31 16:33:00 +0000
350+++ launcher/SoftwareCenterLauncherIcon.cpp 2012-11-27 07:30:28 +0000
351@@ -19,6 +19,7 @@
352 */
353
354 #include <NuxCore/Logger.h>
355+#include "config.h"
356 #include <glib/gi18n-lib.h>
357 #include "SoftwareCenterLauncherIcon.h"
358 #include "Launcher.h"
359
360=== modified file 'launcher/TrashLauncherIcon.cpp'
361--- launcher/TrashLauncherIcon.cpp 2012-11-13 22:39:49 +0000
362+++ launcher/TrashLauncherIcon.cpp 2012-11-27 07:30:28 +0000
363@@ -20,6 +20,7 @@
364
365 #include "TrashLauncherIcon.h"
366
367+#include "config.h"
368 #include <glib/gi18n-lib.h>
369 #include <Nux/WindowCompositor.h>
370 #include <NuxCore/Logger.h>
371
372=== modified file 'launcher/VolumeLauncherIcon.cpp'
373--- launcher/VolumeLauncherIcon.cpp 2012-11-27 01:04:19 +0000
374+++ launcher/VolumeLauncherIcon.cpp 2012-11-27 07:30:28 +0000
375@@ -19,6 +19,7 @@
376 */
377
378
379+#include "config.h"
380 #include <glib/gi18n-lib.h>
381 #include <NuxCore/Logger.h>
382 #include <UnityCore/GLibSignal.h>
383
384=== modified file 'panel/CMakeLists.txt'
385--- panel/CMakeLists.txt 2012-10-18 10:44:07 +0000
386+++ panel/CMakeLists.txt 2012-11-27 07:30:28 +0000
387@@ -5,8 +5,6 @@
388 set (CFLAGS
389 ${CACHED_UNITY_DEPS_CFLAGS}
390 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
391- "-DGETTEXT_PACKAGE=\"unity\""
392- "-I${CMAKE_CURRENT_BINARY_DIR}"
393 )
394
395 if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
396@@ -22,7 +20,7 @@
397 set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
398 link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
399
400-include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
401+include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
402
403 #
404 # Headers & Sources
405@@ -45,5 +43,4 @@
406 # Standalone variant
407 #
408 add_executable (panel StandalonePanel.cpp)
409-add_dependencies (panel panel-lib)
410 target_link_libraries (panel panel-lib unity-shared unity-shared-standalone)
411
412=== modified file 'panel/PanelMenuView.cpp'
413--- panel/PanelMenuView.cpp 2012-11-16 15:58:49 +0000
414+++ panel/PanelMenuView.cpp 2012-11-27 07:30:28 +0000
415@@ -31,6 +31,7 @@
416
417 #include <UnityCore/Variant.h>
418
419+#include "config.h"
420 #include <glib/gi18n-lib.h>
421
422 namespace unity
423
424=== modified file 'services/CMakeLists.txt'
425--- services/CMakeLists.txt 2012-11-06 18:19:09 +0000
426+++ services/CMakeLists.txt 2012-11-27 07:30:28 +0000
427@@ -35,13 +35,12 @@
428 set(CFLAGS
429 "${SERVICE_DEPS_CFLAGS}"
430 ${SERVICE_DEPS_CFLAGS_OTHER}
431- "-I${CMAKE_CURRENT_BINARY_DIR}"
432- "-DGETTEXT_PACKAGE=\"unity\""
433 "-DINDICATORDIR=\"${_indicatordir}\""
434 "-DINDICATORICONDIR=\"${_iconsdir}\""
435 "-Werror -Wall"
436 )
437 add_definitions(${CFLAGS})
438+include_directories(${CMAKE_CURRENT_BINARY_DIR})
439
440 set(LIBS ${SERVICE_DEPS_LIBRARIES})
441 link_libraries(${LIBS})
442
443=== modified file 'shortcuts/CMakeLists.txt'
444--- shortcuts/CMakeLists.txt 2012-10-17 08:46:48 +0000
445+++ shortcuts/CMakeLists.txt 2012-11-27 07:30:28 +0000
446@@ -5,8 +5,6 @@
447 set (CFLAGS
448 ${CACHED_UNITY_DEPS_CFLAGS}
449 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
450- "-DGETTEXT_PACKAGE=\"unity\""
451- "-I${CMAKE_CURRENT_BINARY_DIR}"
452 )
453
454 if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
455@@ -22,7 +20,7 @@
456 set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
457 link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
458
459-include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
460+include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
461
462 #
463 # Headers & Sources
464@@ -48,5 +46,4 @@
465 # Standalone variant
466 #
467 add_executable (shortcuts StandaloneShortcuts.cpp)
468-add_dependencies (shortcuts shortcuts-lib)
469 target_link_libraries (shortcuts shortcuts-lib unity-shared)
470
471=== modified file 'shortcuts/ShortcutHintPrivate.cpp'
472--- shortcuts/ShortcutHintPrivate.cpp 2012-05-07 22:28:17 +0000
473+++ shortcuts/ShortcutHintPrivate.cpp 2012-11-27 07:30:28 +0000
474@@ -16,6 +16,7 @@
475 * Authored by: Andrea Azzarone <azzaronea@gmail.com>
476 */
477
478+#include "config.h"
479 #include <glib/gi18n-lib.h>
480 #include <gtk/gtk.h>
481
482
483=== modified file 'shortcuts/StandaloneShortcuts.cpp'
484--- shortcuts/StandaloneShortcuts.cpp 2012-09-11 10:38:31 +0000
485+++ shortcuts/StandaloneShortcuts.cpp 2012-11-27 07:30:28 +0000
486@@ -17,6 +17,7 @@
487 * Authored by: Andrea Azzarone <azzaronea@gmail.com>
488 */
489
490+#include "config.h"
491 #include <glib/gi18n-lib.h>
492 #include <gtk/gtk.h>
493 #include <Nux/Nux.h>
494
495=== modified file 'unity-shared/CMakeLists.txt'
496--- unity-shared/CMakeLists.txt 2012-11-20 21:08:54 +0000
497+++ unity-shared/CMakeLists.txt 2012-11-27 07:30:28 +0000
498@@ -5,8 +5,6 @@
499 set (CFLAGS
500 ${CACHED_UNITY_DEPS_CFLAGS}
501 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
502- "-DGETTEXT_PACKAGE=\"unity\""
503- "-I${CMAKE_CURRENT_BINARY_DIR}"
504 )
505
506 if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
507@@ -20,7 +18,7 @@
508 set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
509 link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
510
511-include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
512+include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
513
514 #
515 # Headers & Sources
516
517=== modified file 'unity-shared/TextInput.h'
518--- unity-shared/TextInput.h 2012-11-22 12:53:25 +0000
519+++ unity-shared/TextInput.h 2012-11-27 07:30:28 +0000
520@@ -20,6 +20,8 @@
521 #ifndef TEXTINPUT_H
522 #define TEXTINPUT_H
523
524+#include "config.h"
525+
526 #include <glib/gi18n-lib.h>
527 #include <gtk/gtk.h>
528
529@@ -34,7 +36,6 @@
530 #include <UnityCore/GLibSource.h>
531 #include <UnityCore/Variant.h>
532
533-#include "config.h"
534 #include "CairoTexture.h"
535 #include "unity-shared/IconTexture.h"
536 #include "unity-shared/IMTextEntry.h"
537
538=== modified file 'unity-standalone/CMakeLists.txt'
539--- unity-standalone/CMakeLists.txt 2012-10-17 08:46:48 +0000
540+++ unity-standalone/CMakeLists.txt 2012-11-27 07:30:28 +0000
541@@ -5,8 +5,6 @@
542 set (CFLAGS
543 ${CACHED_UNITY_DEPS_CFLAGS}
544 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
545- "-DGETTEXT_PACKAGE=\"unity\""
546- "-I${CMAKE_CURRENT_BINARY_DIR}"
547 )
548
549 if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
550@@ -22,7 +20,7 @@
551 set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
552 link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
553
554-include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
555+include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
556
557 #
558 # Headers & Sources
559@@ -32,12 +30,6 @@
560 )
561
562 add_executable (unity-standalone StandaloneUnity.cpp)
563-add_dependencies (unity-standalone
564- dash-lib
565- launcher-lib
566- panel-lib
567- unity-shared
568- unity-shared-standalone)
569 target_link_libraries (unity-standalone
570 dash-lib
571 launcher-lib