Merge lp:~vikoadi/arrive/update-cmake into lp:~vikoadi/arrive/0.2
- update-cmake
- Merge into 0.2
Proposed by
Viko Adi Rahmawan
Status: | Merged |
---|---|
Merge reported by: | Viko Adi Rahmawan |
Merged at revision: | not available |
Proposed branch: | lp:~vikoadi/arrive/update-cmake |
Merge into: | lp:~vikoadi/arrive/0.2 |
Diff against target: |
2590 lines (+345/-961) 86 files modified
CMakeLists.txt (+1/-1) cmake/FindGirCompiler.cmake (+56/-0) cmake/FindVala.cmake (+0/-65) cmake/GObjectIntrospectionMacros.cmake (+0/-16) cmake/GSettings.cmake (+0/-42) cmake/Makefile (+0/-286) cmake/ParseArguments.cmake (+0/-36) cmake/README (+0/-10) cmake/README.Vala.rst (+0/-173) cmake/Tests.cmake (+0/-5) cmake/Translations.cmake (+0/-41) cmake/ValaPrecompile.cmake (+0/-175) cmake/ValaVersion.cmake (+0/-96) po/af.po (+4/-0) po/am.po (+4/-0) po/ar.po (+4/-0) po/ast.po (+4/-0) po/az.po (+4/-0) po/be.po (+4/-0) po/bg.po (+4/-0) po/bn.po (+4/-0) po/bs.po (+4/-0) po/ca.po (+4/-0) po/ckb.po (+4/-0) po/cs.po (+4/-0) po/da.po (+4/-0) po/de.po (+4/-0) po/el.po (+4/-0) po/en_AU.po (+4/-0) po/en_CA.po (+4/-0) po/en_GB.po (+4/-0) po/eo.po (+4/-0) po/es.po (+4/-0) po/et.po (+4/-0) po/eu.po (+4/-0) po/fa.po (+4/-0) po/fi.po (+4/-0) po/fr.po (+4/-0) po/fr_CA.po (+4/-0) po/gl.po (+4/-0) po/he.po (+4/-0) po/hi.po (+4/-0) po/hr.po (+4/-0) po/hu.po (+4/-0) po/hy.po (+4/-0) po/id.po (+4/-0) po/it.po (+4/-0) po/ja.po (+4/-0) po/ka.po (+4/-0) po/ko.po (+4/-0) po/ky.po (+4/-0) po/lb.po (+4/-0) po/lo.po (+4/-0) po/lt.po (+4/-0) po/lv.po (+4/-0) po/ml.po (+4/-0) po/mr.po (+4/-0) po/ms.po (+4/-0) po/nb.po (+4/-0) po/nl.po (+4/-0) po/nn.po (+4/-0) po/pl.po (+4/-0) po/pt.po (+4/-0) po/pt_BR.po (+4/-0) po/ro.po (+4/-0) po/ru.po (+4/-0) po/rue.po (+4/-0) po/si.po (+4/-0) po/sk.po (+4/-0) po/sl.po (+4/-0) po/sma.po (+4/-0) po/sq.po (+4/-0) po/sr.po (+4/-0) po/sv.po (+4/-0) po/sw.po (+4/-0) po/ta.po (+4/-0) po/te.po (+4/-0) po/th.po (+4/-0) po/tr.po (+4/-0) po/uk.po (+4/-0) po/vi.po (+4/-0) po/zh_CN.po (+4/-0) po/zh_HK.po (+4/-0) po/zh_TW.po (+4/-0) src/CMakeLists.txt (+4/-4) src/config.vala (+0/-11) |
To merge this branch: | bzr merge lp:~vikoadi/arrive/update-cmake |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Viko Adi Rahmawan | Approve | ||
Review via email: mp+238314@code.launchpad.net |
Commit message
Description of the change
update cmkae
To post a comment you must log in.
Revision history for this message
Viko Adi Rahmawan (vikoadi) : | # |
review:
Approve
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 2013-07-23 03:38:01 +0000 |
3 | +++ CMakeLists.txt 2014-10-14 15:21:32 +0000 |
4 | @@ -8,7 +8,7 @@ |
5 | set (PKGDATADIR "${DATADIR}/arrive") |
6 | set (GETTEXT_PACKAGE "arrive") |
7 | set (RELEASE_NAME "Download Manager") |
8 | -set (VERSION "0.1") |
9 | +set (VERSION "0.2") |
10 | set (VERSION_INFO "Release") |
11 | set (CMAKE_C_FLAGS "-ggdb") |
12 | set (PREFIX ${CMAKE_INSTALL_PREFIX}) |
13 | |
14 | === added file 'cmake/FindGirCompiler.cmake' |
15 | --- cmake/FindGirCompiler.cmake 1970-01-01 00:00:00 +0000 |
16 | +++ cmake/FindGirCompiler.cmake 2014-10-14 15:21:32 +0000 |
17 | @@ -0,0 +1,56 @@ |
18 | +## |
19 | +# Copyright 2009-2010 Jakob Westhoff. All rights reserved. |
20 | +# |
21 | +# Redistribution and use in source and binary forms, with or without |
22 | +# modification, are permitted provided that the following conditions are met: |
23 | +# |
24 | +# 1. Redistributions of source code must retain the above copyright notice, |
25 | +# this list of conditions and the following disclaimer. |
26 | +# |
27 | +# 2. Redistributions in binary form must reproduce the above copyright notice, |
28 | +# this list of conditions and the following disclaimer in the documentation |
29 | +# and/or other materials provided with the distribution. |
30 | +# |
31 | +# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR |
32 | +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
33 | +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
34 | +# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
35 | +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
36 | +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
37 | +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF |
38 | +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE |
39 | +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
40 | +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
41 | +# |
42 | +# The views and conclusions contained in the software and documentation are those |
43 | +# of the authors and should not be interpreted as representing official policies, |
44 | +# either expressed or implied, of Jakob Westhoff |
45 | +## |
46 | + |
47 | +## |
48 | +# Find module for the Gir compiler (g-ir-compiler) |
49 | +# |
50 | +# This module determines wheter a Gir compiler is installed on the current |
51 | +# system and where its executable is. |
52 | +# |
53 | +# Call the module using "find_package(GirCompiler) from within your CMakeLists.txt. |
54 | +# |
55 | +# The following variables will be set after an invocation: |
56 | +# |
57 | +# G_IR_COMPILER_FOUND Whether the g-ir-compiler compiler has been found or not |
58 | +# G_IR_COMPILER_EXECUTABLE Full path to the g-ir-compiler executable if it has been found |
59 | +## |
60 | + |
61 | + |
62 | +# Search for the g-ir-compiler executable in the usual system paths. |
63 | +find_program (G_IR_COMPILER_EXECUTABLE |
64 | + NAMES g-ir-compiler) |
65 | + |
66 | +# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call. |
67 | +# Furthermore set G_IR_COMPILER_FOUND to TRUE if the g-ir-compiler has been found (aka. |
68 | +# G_IR_COMPILER_EXECUTABLE is set) |
69 | + |
70 | +include (FindPackageHandleStandardArgs) |
71 | +find_package_handle_standard_args (GirCompiler DEFAULT_MSG G_IR_COMPILER_EXECUTABLE) |
72 | + |
73 | +mark_as_advanced (G_IR_COMPILER_EXECUTABLE) |
74 | |
75 | === added file 'cmake/FindVala.cmake' |
76 | --- cmake/FindVala.cmake 1970-01-01 00:00:00 +0000 |
77 | +++ cmake/FindVala.cmake 2014-10-14 15:21:32 +0000 |
78 | @@ -0,0 +1,65 @@ |
79 | +## |
80 | +# Copyright 2009-2010 Jakob Westhoff. All rights reserved. |
81 | +# |
82 | +# Redistribution and use in source and binary forms, with or without |
83 | +# modification, are permitted provided that the following conditions are met: |
84 | +# |
85 | +# 1. Redistributions of source code must retain the above copyright notice, |
86 | +# this list of conditions and the following disclaimer. |
87 | +# |
88 | +# 2. Redistributions in binary form must reproduce the above copyright notice, |
89 | +# this list of conditions and the following disclaimer in the documentation |
90 | +# and/or other materials provided with the distribution. |
91 | +# |
92 | +# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR |
93 | +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
94 | +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
95 | +# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
96 | +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
97 | +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
98 | +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF |
99 | +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE |
100 | +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
101 | +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
102 | +# |
103 | +# The views and conclusions contained in the software and documentation are those |
104 | +# of the authors and should not be interpreted as representing official policies, |
105 | +# either expressed or implied, of Jakob Westhoff |
106 | +## |
107 | + |
108 | +## |
109 | +# Find module for the Vala compiler (valac) |
110 | +# |
111 | +# This module determines wheter a Vala compiler is installed on the current |
112 | +# system and where its executable is. |
113 | +# |
114 | +# Call the module using "find_package(Vala) from within your CMakeLists.txt. |
115 | +# |
116 | +# The following variables will be set after an invocation: |
117 | +# |
118 | +# VALA_FOUND Whether the vala compiler has been found or not |
119 | +# VALA_EXECUTABLE Full path to the valac executable if it has been found |
120 | +# VALA_VERSION Version number of the available valac |
121 | +## |
122 | + |
123 | + |
124 | +# Search for the valac executable in the usual system paths. |
125 | +find_program(VALA_EXECUTABLE |
126 | + NAMES valac) |
127 | + |
128 | +# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call. |
129 | +# Furthermore set VALA_FOUND to TRUE if Vala has been found (aka. |
130 | +# VALA_EXECUTABLE is set) |
131 | + |
132 | +include(FindPackageHandleStandardArgs) |
133 | +find_package_handle_standard_args(Vala DEFAULT_MSG VALA_EXECUTABLE) |
134 | + |
135 | +mark_as_advanced(VALA_EXECUTABLE) |
136 | + |
137 | +# Determine the valac version |
138 | +if(VALA_FOUND) |
139 | + execute_process(COMMAND ${VALA_EXECUTABLE} "--version" |
140 | + OUTPUT_VARIABLE "VALA_VERSION") |
141 | + string(REPLACE "Vala" "" "VALA_VERSION" ${VALA_VERSION}) |
142 | + string(STRIP ${VALA_VERSION} "VALA_VERSION") |
143 | +endif(VALA_FOUND) |
144 | |
145 | === removed file 'cmake/FindVala.cmake' |
146 | --- cmake/FindVala.cmake 2013-02-16 16:53:34 +0000 |
147 | +++ cmake/FindVala.cmake 1970-01-01 00:00:00 +0000 |
148 | @@ -1,65 +0,0 @@ |
149 | -## |
150 | -# Copyright 2009-2010 Jakob Westhoff. All rights reserved. |
151 | -# |
152 | -# Redistribution and use in source and binary forms, with or without |
153 | -# modification, are permitted provided that the following conditions are met: |
154 | -# |
155 | -# 1. Redistributions of source code must retain the above copyright notice, |
156 | -# this list of conditions and the following disclaimer. |
157 | -# |
158 | -# 2. Redistributions in binary form must reproduce the above copyright notice, |
159 | -# this list of conditions and the following disclaimer in the documentation |
160 | -# and/or other materials provided with the distribution. |
161 | -# |
162 | -# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR |
163 | -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
164 | -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
165 | -# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
166 | -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
167 | -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
168 | -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF |
169 | -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE |
170 | -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
171 | -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
172 | -# |
173 | -# The views and conclusions contained in the software and documentation are those |
174 | -# of the authors and should not be interpreted as representing official policies, |
175 | -# either expressed or implied, of Jakob Westhoff |
176 | -## |
177 | - |
178 | -## |
179 | -# Find module for the Vala compiler (valac) |
180 | -# |
181 | -# This module determines wheter a Vala compiler is installed on the current |
182 | -# system and where its executable is. |
183 | -# |
184 | -# Call the module using "find_package(Vala) from within your CMakeLists.txt. |
185 | -# |
186 | -# The following variables will be set after an invocation: |
187 | -# |
188 | -# VALA_FOUND Whether the vala compiler has been found or not |
189 | -# VALA_EXECUTABLE Full path to the valac executable if it has been found |
190 | -# VALA_VERSION Version number of the available valac |
191 | -## |
192 | - |
193 | - |
194 | -# Search for the valac executable in the usual system paths. |
195 | -find_program(VALA_EXECUTABLE |
196 | - NAMES valac) |
197 | - |
198 | -# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call. |
199 | -# Furthermore set VALA_FOUND to TRUE if Vala has been found (aka. |
200 | -# VALA_EXECUTABLE is set) |
201 | - |
202 | -include(FindPackageHandleStandardArgs) |
203 | -find_package_handle_standard_args(Vala DEFAULT_MSG VALA_EXECUTABLE) |
204 | - |
205 | -mark_as_advanced(VALA_EXECUTABLE) |
206 | - |
207 | -# Determine the valac version |
208 | -if(VALA_FOUND) |
209 | - execute_process(COMMAND ${VALA_EXECUTABLE} "--version" |
210 | - OUTPUT_VARIABLE "VALA_VERSION") |
211 | - string(REPLACE "Vala" "" "VALA_VERSION" ${VALA_VERSION}) |
212 | - string(STRIP ${VALA_VERSION} "VALA_VERSION") |
213 | -endif(VALA_FOUND) |
214 | |
215 | === added file 'cmake/GObjectIntrospectionMacros.cmake' |
216 | --- cmake/GObjectIntrospectionMacros.cmake 1970-01-01 00:00:00 +0000 |
217 | +++ cmake/GObjectIntrospectionMacros.cmake 2014-10-14 15:21:32 +0000 |
218 | @@ -0,0 +1,34 @@ |
219 | +macro(add_target_gir TARGET_NAME GIR_NAME HEADER CFLAGS GRANITE_VERSION) |
220 | + set(PACKAGES "") |
221 | + foreach(PKG ${ARGN}) |
222 | + set(PACKAGES ${PACKAGES} --include=${PKG}) |
223 | + endforeach() |
224 | + install(CODE "set(ENV{LD_LIBRARY_PATH} \"${CMAKE_CURRENT_BINARY_DIR}:\$ENV{LD_LIBRARY_PATH}\") |
225 | + execute_process(COMMAND g-ir-scanner ${CFLAGS} -n ${GIR_NAME} |
226 | + --quiet |
227 | + --library ${TARGET_NAME} ${PACKAGES} |
228 | + -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir |
229 | + -L${CMAKE_CURRENT_BINARY_DIR} |
230 | + --nsversion=${GRANITE_VERSION} ${HEADER})") |
231 | + install(CODE "execute_process(COMMAND g-ir-compiler ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib)") |
232 | + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir DESTINATION share/gir-1.0/) |
233 | + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib DESTINATION lib/girepository-1.0/) |
234 | +endmacro() |
235 | + |
236 | +macro(add_target_gir_with_executable TARGET_NAME EXE_NAME GIR_NAME HEADER EXE_HEADER CFLAGS GRANITE_VERSION) |
237 | + set(PACKAGES "") |
238 | + foreach(PKG ${ARGN}) |
239 | + set(PACKAGES ${PACKAGES} --include=${PKG}) |
240 | + endforeach() |
241 | + install(CODE "set(ENV{LD_LIBRARY_PATH} \"${CMAKE_CURRENT_BINARY_DIR}:\$ENV{LD_LIBRARY_PATH}\") |
242 | + execute_process(COMMAND g-ir-scanner ${CFLAGS} -n ${GIR_NAME} |
243 | + --quiet |
244 | + --library ${TARGET_NAME} --program ${EXE_NAME} ${PACKAGES} |
245 | + -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir |
246 | + -L${CMAKE_CURRENT_BINARY_DIR} |
247 | + -I${CMAKE_CURRENT_BINARY_DIR} |
248 | + --nsversion=${GRANITE_VERSION} ${HEADER} ${EXE_HEADER})") |
249 | + install(CODE "execute_process(COMMAND g-ir-compiler ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib)") |
250 | + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir DESTINATION share/gir-1.0/) |
251 | + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib DESTINATION lib/girepository-1.0/) |
252 | +endmacro() |
253 | |
254 | === removed file 'cmake/GObjectIntrospectionMacros.cmake' |
255 | --- cmake/GObjectIntrospectionMacros.cmake 2013-02-16 16:53:34 +0000 |
256 | +++ cmake/GObjectIntrospectionMacros.cmake 1970-01-01 00:00:00 +0000 |
257 | @@ -1,16 +0,0 @@ |
258 | -macro(add_target_gir TARGET_NAME GIR_NAME HEADER CFLAGS GRANITE_VERSION) |
259 | - set(PACKAGES "") |
260 | - foreach(PKG ${ARGN}) |
261 | - set(PACKAGES ${PACKAGES} --include=${PKG}) |
262 | - endforeach() |
263 | - install(CODE "set(ENV{LD_LIBRARY_PATH} \"${CMAKE_CURRENT_BINARY_DIR}:\$ENV{LD_LIBRARY_PATH}\") |
264 | - execute_process(COMMAND g-ir-scanner ${CFLAGS} -n ${GIR_NAME} |
265 | - --quiet |
266 | - --library ${PKGNAME} ${PACKAGES} |
267 | - -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir |
268 | - -L${CMAKE_CURRENT_BINARY_DIR} |
269 | - --nsversion=${GRANITE_VERSION} ${CMAKE_CURRENT_BINARY_DIR}/${HEADER})") |
270 | - install(CODE "execute_process(COMMAND g-ir-compiler ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib)") |
271 | - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir DESTINATION share/gir-1.0/) |
272 | - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib DESTINATION lib/girepository-1.0/) |
273 | -endmacro() |
274 | |
275 | === added file 'cmake/GSettings.cmake' |
276 | --- cmake/GSettings.cmake 1970-01-01 00:00:00 +0000 |
277 | +++ cmake/GSettings.cmake 2014-10-14 15:21:32 +0000 |
278 | @@ -0,0 +1,42 @@ |
279 | +# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them. |
280 | + |
281 | +option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" ON) |
282 | + |
283 | +option (GSETTINGS_COMPILE "Compile GSettings Schemas after installation" ${GSETTINGS_LOCALINSTALL}) |
284 | + |
285 | +if(GSETTINGS_LOCALINSTALL) |
286 | + message(STATUS "GSettings schemas will be installed locally.") |
287 | +endif() |
288 | + |
289 | +if(GSETTINGS_COMPILE) |
290 | + message(STATUS "GSettings shemas will be compiled.") |
291 | +endif() |
292 | + |
293 | +macro(add_schema SCHEMA_NAME) |
294 | + |
295 | + set(PKG_CONFIG_EXECUTABLE pkg-config) |
296 | + # Have an option to not install the schema into where GLib is |
297 | + if (GSETTINGS_LOCALINSTALL) |
298 | + SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/") |
299 | + else (GSETTINGS_LOCALINSTALL) |
300 | + execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE) |
301 | + SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/") |
302 | + endif (GSETTINGS_LOCALINSTALL) |
303 | + |
304 | + # Run the validator and error if it fails |
305 | + execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE) |
306 | + execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE) |
307 | + |
308 | + if (_schemas_invalid) |
309 | + message (SEND_ERROR "Schema validation error: ${_schemas_invalid}") |
310 | + endif (_schemas_invalid) |
311 | + |
312 | + # Actually install and recomple schemas |
313 | + message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}") |
314 | + install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL) |
315 | + |
316 | + if (GSETTINGS_COMPILE) |
317 | + install (CODE "message (STATUS \"Compiling GSettings schemas\")") |
318 | + install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})") |
319 | + endif () |
320 | +endmacro() |
321 | |
322 | === removed file 'cmake/GSettings.cmake' |
323 | --- cmake/GSettings.cmake 2013-02-16 16:53:34 +0000 |
324 | +++ cmake/GSettings.cmake 1970-01-01 00:00:00 +0000 |
325 | @@ -1,42 +0,0 @@ |
326 | -# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them. |
327 | - |
328 | -option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" ON) |
329 | - |
330 | -option (GSETTINGS_COMPILE "Compile GSettings Schemas after installation" ${GSETTINGS_LOCALINSTALL}) |
331 | - |
332 | -if(GSETTINGS_LOCALINSTALL) |
333 | - message(STATUS "GSettings schemas will be installed locally.") |
334 | -endif() |
335 | - |
336 | -if(GSETTINGS_COMPILE) |
337 | - message(STATUS "GSettings shemas will be compiled.") |
338 | -endif() |
339 | - |
340 | -macro(add_schema SCHEMA_NAME) |
341 | - |
342 | - set(PKG_CONFIG_EXECUTABLE pkg-config) |
343 | - # Have an option to not install the schema into where GLib is |
344 | - if (GSETTINGS_LOCALINSTALL) |
345 | - SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/") |
346 | - else (GSETTINGS_LOCALINSTALL) |
347 | - execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE) |
348 | - SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/") |
349 | - endif (GSETTINGS_LOCALINSTALL) |
350 | - |
351 | - # Run the validator and error if it fails |
352 | - execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE) |
353 | - execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE) |
354 | - |
355 | - if (_schemas_invalid) |
356 | - message (SEND_ERROR "Schema validation error: ${_schemas_invalid}") |
357 | - endif (_schemas_invalid) |
358 | - |
359 | - # Actually install and recomple schemas |
360 | - message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}") |
361 | - install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL) |
362 | - |
363 | - if (GSETTINGS_COMPILE) |
364 | - install (CODE "message (STATUS \"Compiling GSettings schemas\")") |
365 | - install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})") |
366 | - endif () |
367 | -endmacro() |
368 | |
369 | === removed file 'cmake/Makefile' |
370 | --- cmake/Makefile 2013-02-16 16:53:34 +0000 |
371 | +++ cmake/Makefile 1970-01-01 00:00:00 +0000 |
372 | @@ -1,286 +0,0 @@ |
373 | -# CMAKE generated file: DO NOT EDIT! |
374 | -# Generated by "Unix Makefiles" Generator, CMake Version 2.8 |
375 | - |
376 | -# Default target executed when no arguments are given to make. |
377 | -default_target: all |
378 | -.PHONY : default_target |
379 | - |
380 | -#============================================================================= |
381 | -# Special targets provided by cmake. |
382 | - |
383 | -# Disable implicit rules so canoncical targets will work. |
384 | -.SUFFIXES: |
385 | - |
386 | -# Remove some rules from gmake that .SUFFIXES does not remove. |
387 | -SUFFIXES = |
388 | - |
389 | -.SUFFIXES: .hpux_make_needs_suffix_list |
390 | - |
391 | -# Suppress display of executed commands. |
392 | -$(VERBOSE).SILENT: |
393 | - |
394 | -# A target that is always out of date. |
395 | -cmake_force: |
396 | -.PHONY : cmake_force |
397 | - |
398 | -#============================================================================= |
399 | -# Set environment variables for the build. |
400 | - |
401 | -# The shell in which to execute make rules. |
402 | -SHELL = /bin/sh |
403 | - |
404 | -# The CMake executable. |
405 | -CMAKE_COMMAND = /usr/bin/cmake |
406 | - |
407 | -# The command to remove a file. |
408 | -RM = /usr/bin/cmake -E remove -f |
409 | - |
410 | -# The top-level source directory on which CMake was run. |
411 | -CMAKE_SOURCE_DIR = /home/mefrio/Scrivania/cmake |
412 | - |
413 | -# The top-level build directory on which CMake was run. |
414 | -CMAKE_BINARY_DIR = /home/mefrio/Scrivania/cmake/cmake |
415 | - |
416 | -#============================================================================= |
417 | -# Targets provided globally by CMake. |
418 | - |
419 | -# Special rule for the target edit_cache |
420 | -edit_cache: |
421 | - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..." |
422 | - /usr/bin/cmake -i . |
423 | -.PHONY : edit_cache |
424 | - |
425 | -# Special rule for the target edit_cache |
426 | -edit_cache/fast: edit_cache |
427 | -.PHONY : edit_cache/fast |
428 | - |
429 | -# Special rule for the target install |
430 | -install: preinstall |
431 | - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." |
432 | - /usr/bin/cmake -P cmake_install.cmake |
433 | -.PHONY : install |
434 | - |
435 | -# Special rule for the target install |
436 | -install/fast: preinstall/fast |
437 | - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." |
438 | - /usr/bin/cmake -P cmake_install.cmake |
439 | -.PHONY : install/fast |
440 | - |
441 | -# Special rule for the target install/local |
442 | -install/local: preinstall |
443 | - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..." |
444 | - /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake |
445 | -.PHONY : install/local |
446 | - |
447 | -# Special rule for the target install/local |
448 | -install/local/fast: install/local |
449 | -.PHONY : install/local/fast |
450 | - |
451 | -# Special rule for the target install/strip |
452 | -install/strip: preinstall |
453 | - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..." |
454 | - /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake |
455 | -.PHONY : install/strip |
456 | - |
457 | -# Special rule for the target install/strip |
458 | -install/strip/fast: install/strip |
459 | -.PHONY : install/strip/fast |
460 | - |
461 | -# Special rule for the target list_install_components |
462 | -list_install_components: |
463 | - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\"" |
464 | -.PHONY : list_install_components |
465 | - |
466 | -# Special rule for the target list_install_components |
467 | -list_install_components/fast: list_install_components |
468 | -.PHONY : list_install_components/fast |
469 | - |
470 | -# Special rule for the target rebuild_cache |
471 | -rebuild_cache: |
472 | - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." |
473 | - /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) |
474 | -.PHONY : rebuild_cache |
475 | - |
476 | -# Special rule for the target rebuild_cache |
477 | -rebuild_cache/fast: rebuild_cache |
478 | -.PHONY : rebuild_cache/fast |
479 | - |
480 | -# The main all target |
481 | -all: cmake_check_build_system |
482 | - $(CMAKE_COMMAND) -E cmake_progress_start /home/mefrio/Scrivania/cmake/cmake/CMakeFiles /home/mefrio/Scrivania/cmake/cmake/CMakeFiles/progress.marks |
483 | - $(MAKE) -f CMakeFiles/Makefile2 all |
484 | - $(CMAKE_COMMAND) -E cmake_progress_start /home/mefrio/Scrivania/cmake/cmake/CMakeFiles 0 |
485 | -.PHONY : all |
486 | - |
487 | -# The main clean target |
488 | -clean: |
489 | - $(MAKE) -f CMakeFiles/Makefile2 clean |
490 | -.PHONY : clean |
491 | - |
492 | -# The main clean target |
493 | -clean/fast: clean |
494 | -.PHONY : clean/fast |
495 | - |
496 | -# Prepare targets for installation. |
497 | -preinstall: all |
498 | - $(MAKE) -f CMakeFiles/Makefile2 preinstall |
499 | -.PHONY : preinstall |
500 | - |
501 | -# Prepare targets for installation. |
502 | -preinstall/fast: |
503 | - $(MAKE) -f CMakeFiles/Makefile2 preinstall |
504 | -.PHONY : preinstall/fast |
505 | - |
506 | -# clear depends |
507 | -depend: |
508 | - $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 |
509 | -.PHONY : depend |
510 | - |
511 | -#============================================================================= |
512 | -# Target rules for targets named scratch |
513 | - |
514 | -# Build rule for target. |
515 | -scratch: cmake_check_build_system |
516 | - $(MAKE) -f CMakeFiles/Makefile2 scratch |
517 | -.PHONY : scratch |
518 | - |
519 | -# fast build rule for target. |
520 | -scratch/fast: |
521 | - $(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/build |
522 | -.PHONY : scratch/fast |
523 | - |
524 | -src/entry.o: src/entry.c.o |
525 | -.PHONY : src/entry.o |
526 | - |
527 | -# target to build an object file |
528 | -src/entry.c.o: |
529 | - $(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/entry.c.o |
530 | -.PHONY : src/entry.c.o |
531 | - |
532 | -src/entry.i: src/entry.c.i |
533 | -.PHONY : src/entry.i |
534 | - |
535 | -# target to preprocess a source file |
536 | -src/entry.c.i: |
537 | - $(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/entry.c.i |
538 | -.PHONY : src/entry.c.i |
539 | - |
540 | -src/entry.s: src/entry.c.s |
541 | -.PHONY : src/entry.s |
542 | - |
543 | -# target to generate assembly for a file |
544 | -src/entry.c.s: |
545 | - $(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/entry.c.s |
546 | -.PHONY : src/entry.c.s |
547 | - |
548 | -src/main_window.o: src/main_window.c.o |
549 | -.PHONY : src/main_window.o |
550 | - |
551 | -# target to build an object file |
552 | -src/main_window.c.o: |
553 | - $(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/main_window.c.o |
554 | -.PHONY : src/main_window.c.o |
555 | - |
556 | -src/main_window.i: src/main_window.c.i |
557 | -.PHONY : src/main_window.i |
558 | - |
559 | -# target to preprocess a source file |
560 | -src/main_window.c.i: |
561 | - $(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/main_window.c.i |
562 | -.PHONY : src/main_window.c.i |
563 | - |
564 | -src/main_window.s: src/main_window.c.s |
565 | -.PHONY : src/main_window.s |
566 | - |
567 | -# target to generate assembly for a file |
568 | -src/main_window.c.s: |
569 | - $(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/main_window.c.s |
570 | -.PHONY : src/main_window.c.s |
571 | - |
572 | -src/menu.o: src/menu.c.o |
573 | -.PHONY : src/menu.o |
574 | - |
575 | -# target to build an object file |
576 | -src/menu.c.o: |
577 | - $(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/menu.c.o |
578 | -.PHONY : src/menu.c.o |
579 | - |
580 | -src/menu.i: src/menu.c.i |
581 | -.PHONY : src/menu.i |
582 | - |
583 | -# target to preprocess a source file |
584 | -src/menu.c.i: |
585 | - $(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/menu.c.i |
586 | -.PHONY : src/menu.c.i |
587 | - |
588 | -src/menu.s: src/menu.c.s |
589 | -.PHONY : src/menu.s |
590 | - |
591 | -# target to generate assembly for a file |
592 | -src/menu.c.s: |
593 | - $(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/menu.c.s |
594 | -.PHONY : src/menu.c.s |
595 | - |
596 | -src/notebook.o: src/notebook.c.o |
597 | -.PHONY : src/notebook.o |
598 | - |
599 | -# target to build an object file |
600 | -src/notebook.c.o: |
601 | - $(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/notebook.c.o |
602 | -.PHONY : src/notebook.c.o |
603 | - |
604 | -src/notebook.i: src/notebook.c.i |
605 | -.PHONY : src/notebook.i |
606 | - |
607 | -# target to preprocess a source file |
608 | -src/notebook.c.i: |
609 | - $(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/notebook.c.i |
610 | -.PHONY : src/notebook.c.i |
611 | - |
612 | -src/notebook.s: src/notebook.c.s |
613 | -.PHONY : src/notebook.s |
614 | - |
615 | -# target to generate assembly for a file |
616 | -src/notebook.c.s: |
617 | - $(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/notebook.c.s |
618 | -.PHONY : src/notebook.c.s |
619 | - |
620 | -# Help Target |
621 | -help: |
622 | - @echo "The following are some of the valid targets for this Makefile:" |
623 | - @echo "... all (the default if no target is provided)" |
624 | - @echo "... clean" |
625 | - @echo "... depend" |
626 | - @echo "... edit_cache" |
627 | - @echo "... install" |
628 | - @echo "... install/local" |
629 | - @echo "... install/strip" |
630 | - @echo "... list_install_components" |
631 | - @echo "... rebuild_cache" |
632 | - @echo "... scratch" |
633 | - @echo "... src/entry.o" |
634 | - @echo "... src/entry.i" |
635 | - @echo "... src/entry.s" |
636 | - @echo "... src/main_window.o" |
637 | - @echo "... src/main_window.i" |
638 | - @echo "... src/main_window.s" |
639 | - @echo "... src/menu.o" |
640 | - @echo "... src/menu.i" |
641 | - @echo "... src/menu.s" |
642 | - @echo "... src/notebook.o" |
643 | - @echo "... src/notebook.i" |
644 | - @echo "... src/notebook.s" |
645 | -.PHONY : help |
646 | - |
647 | - |
648 | - |
649 | -#============================================================================= |
650 | -# Special targets to cleanup operation of make. |
651 | - |
652 | -# Special rule to run CMake to check the build system integrity. |
653 | -# No rule that depends on this can have commands that come from listfiles |
654 | -# because they might be regenerated. |
655 | -cmake_check_build_system: |
656 | - $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 |
657 | -.PHONY : cmake_check_build_system |
658 | - |
659 | |
660 | === added file 'cmake/ParseArguments.cmake' |
661 | --- cmake/ParseArguments.cmake 1970-01-01 00:00:00 +0000 |
662 | +++ cmake/ParseArguments.cmake 2014-10-14 15:21:32 +0000 |
663 | @@ -0,0 +1,36 @@ |
664 | +## |
665 | +# This is a helper Macro to parse optional arguments in Macros/Functions |
666 | +# It has been taken from the public CMake wiki. |
667 | +# See http://www.cmake.org/Wiki/CMakeMacroParseArguments for documentation and |
668 | +# licensing. |
669 | +## |
670 | +macro(parse_arguments prefix arg_names option_names) |
671 | + set(DEFAULT_ARGS) |
672 | + foreach(arg_name ${arg_names}) |
673 | + set(${prefix}_${arg_name}) |
674 | + endforeach(arg_name) |
675 | + foreach(option ${option_names}) |
676 | + set(${prefix}_${option} FALSE) |
677 | + endforeach(option) |
678 | + |
679 | + set(current_arg_name DEFAULT_ARGS) |
680 | + set(current_arg_list) |
681 | + foreach(arg ${ARGN}) |
682 | + set(larg_names ${arg_names}) |
683 | + list(FIND larg_names "${arg}" is_arg_name) |
684 | + if(is_arg_name GREATER -1) |
685 | + set(${prefix}_${current_arg_name} ${current_arg_list}) |
686 | + set(current_arg_name ${arg}) |
687 | + set(current_arg_list) |
688 | + else(is_arg_name GREATER -1) |
689 | + set(loption_names ${option_names}) |
690 | + list(FIND loption_names "${arg}" is_option) |
691 | + if(is_option GREATER -1) |
692 | + set(${prefix}_${arg} TRUE) |
693 | + else(is_option GREATER -1) |
694 | + set(current_arg_list ${current_arg_list} ${arg}) |
695 | + endif(is_option GREATER -1) |
696 | + endif(is_arg_name GREATER -1) |
697 | + endforeach(arg) |
698 | + set(${prefix}_${current_arg_name} ${current_arg_list}) |
699 | +endmacro(parse_arguments) |
700 | |
701 | === removed file 'cmake/ParseArguments.cmake' |
702 | --- cmake/ParseArguments.cmake 2013-02-16 16:53:34 +0000 |
703 | +++ cmake/ParseArguments.cmake 1970-01-01 00:00:00 +0000 |
704 | @@ -1,36 +0,0 @@ |
705 | -## |
706 | -# This is a helper Macro to parse optional arguments in Macros/Functions |
707 | -# It has been taken from the public CMake wiki. |
708 | -# See http://www.cmake.org/Wiki/CMakeMacroParseArguments for documentation and |
709 | -# licensing. |
710 | -## |
711 | -macro(parse_arguments prefix arg_names option_names) |
712 | - set(DEFAULT_ARGS) |
713 | - foreach(arg_name ${arg_names}) |
714 | - set(${prefix}_${arg_name}) |
715 | - endforeach(arg_name) |
716 | - foreach(option ${option_names}) |
717 | - set(${prefix}_${option} FALSE) |
718 | - endforeach(option) |
719 | - |
720 | - set(current_arg_name DEFAULT_ARGS) |
721 | - set(current_arg_list) |
722 | - foreach(arg ${ARGN}) |
723 | - set(larg_names ${arg_names}) |
724 | - list(FIND larg_names "${arg}" is_arg_name) |
725 | - if(is_arg_name GREATER -1) |
726 | - set(${prefix}_${current_arg_name} ${current_arg_list}) |
727 | - set(current_arg_name ${arg}) |
728 | - set(current_arg_list) |
729 | - else(is_arg_name GREATER -1) |
730 | - set(loption_names ${option_names}) |
731 | - list(FIND loption_names "${arg}" is_option) |
732 | - if(is_option GREATER -1) |
733 | - set(${prefix}_${arg} TRUE) |
734 | - else(is_option GREATER -1) |
735 | - set(current_arg_list ${current_arg_list} ${arg}) |
736 | - endif(is_option GREATER -1) |
737 | - endif(is_arg_name GREATER -1) |
738 | - endforeach(arg) |
739 | - set(${prefix}_${current_arg_name} ${current_arg_list}) |
740 | -endmacro(parse_arguments) |
741 | |
742 | === added file 'cmake/README' |
743 | --- cmake/README 1970-01-01 00:00:00 +0000 |
744 | +++ cmake/README 2014-10-14 15:21:32 +0000 |
745 | @@ -0,0 +1,10 @@ |
746 | + Elementary CMake modules |
747 | + |
748 | +This is a set of CMake modules: Translations, GSettings, and Vala modules. |
749 | + |
750 | +For all the Vala related modules see README.Vala.rst: |
751 | + - ParseArguments.cmake |
752 | + - ValaPrecompile.cmake |
753 | + - ValaVersion.cmake |
754 | + - FindVala.cmake |
755 | + |
756 | |
757 | === removed file 'cmake/README' |
758 | --- cmake/README 2013-02-16 16:53:34 +0000 |
759 | +++ cmake/README 1970-01-01 00:00:00 +0000 |
760 | @@ -1,10 +0,0 @@ |
761 | - Elementary CMake modules |
762 | - |
763 | -This is a set of CMake modules: Translations, GSettings, and Vala modules. |
764 | - |
765 | -For all the Vala related modules see README.Vala.rst: |
766 | - - ParseArguments.cmake |
767 | - - ValaPrecompile.cmake |
768 | - - ValaVersion.cmake |
769 | - - FindVala.cmake |
770 | - |
771 | |
772 | === added file 'cmake/README.Vala.rst' |
773 | --- cmake/README.Vala.rst 1970-01-01 00:00:00 +0000 |
774 | +++ cmake/README.Vala.rst 2014-10-14 15:21:32 +0000 |
775 | @@ -0,0 +1,173 @@ |
776 | +========== |
777 | +Vala CMake |
778 | +========== |
779 | +:Author: |
780 | + Jakob Westhoff |
781 | +:Version: |
782 | + Draft |
783 | + |
784 | + |
785 | +Overview |
786 | +======== |
787 | + |
788 | +Vala CMake is a collection of macros for the CMake_ build system to allow the |
789 | +creation and management of projects developed using the Vala_ programming |
790 | +language or its "Genie" flavor (less tested). |
791 | + |
792 | + |
793 | +Installation |
794 | +============ |
795 | + |
796 | +To use the Vala macros in your own project you need to copy the macro files to |
797 | +an arbitrary folder in your projects directory and reference them in your |
798 | +``CMakeLists.txt`` file. |
799 | + |
800 | +Assuming the macros are stored under ``cmake/vala`` in your projects folder you |
801 | +need to add the following information to your base ``CMakeLists.txt``:: |
802 | + |
803 | + list(APPEND CMAKE_MODULE_PATH |
804 | + ${CMAKE_SOURCE_DIR}/cmake/vala |
805 | + ) |
806 | + |
807 | +After the new module path as been added you can simply include the provided |
808 | +modules or use the provided find routines. |
809 | + |
810 | + |
811 | +Finding Vala |
812 | +============ |
813 | + |
814 | +The find module for vala works like any other Find module in CMake. |
815 | +You can use it by simply calling the usual ``find_package`` function. Default |
816 | +parameters like ``REQUIRED`` and ``QUIETLY`` are supported. |
817 | + |
818 | +:: |
819 | + |
820 | + find_package(Vala REQUIRED) |
821 | + |
822 | +After a successful call to the find_package function the following variables |
823 | +will be set: |
824 | + |
825 | +VALA_FOUND |
826 | + Whether the vala compiler has been found or not |
827 | + |
828 | +VALA_EXECUTABLE |
829 | + Full path to the valac executable if it has been found |
830 | + |
831 | +VALA_VERSION |
832 | + Version number of the available valac |
833 | + |
834 | + |
835 | +Precompiling Vala sources |
836 | +========================= |
837 | + |
838 | +CMake is mainly supposed to handle c or c++ based projects. Luckily every vala |
839 | +program is translated into plain c code using the vala compiler, followed by |
840 | +normal compilation of the generated c program using gcc. |
841 | + |
842 | +The macro ``vala_precompile`` uses that fact to create c files from your .vala |
843 | +sources for further CMake processing. |
844 | + |
845 | +The first parameter provided is a variable, which will be filled with a list of |
846 | +c files outputted by the vala compiler. This list can than be used in |
847 | +conjunction with functions like ``add_executable`` or others to create the |
848 | +necessary compile rules with CMake. |
849 | + |
850 | +The initial variable is followed by a list of .vala files to be compiled. |
851 | +Please take care to add every vala file belonging to the currently compiled |
852 | +project or library as Vala will otherwise not be able to resolve all |
853 | +dependencies. |
854 | + |
855 | +The following sections may be specified afterwards to provide certain options |
856 | +to the vala compiler: |
857 | + |
858 | +PACKAGES |
859 | + A list of vala packages/libraries to be used during the compile cycle. The |
860 | + package names are exactly the same, as they would be passed to the valac |
861 | + "--pkg=" option. |
862 | + |
863 | +OPTIONS |
864 | + A list of optional options to be passed to the valac executable. This can be |
865 | + used to pass "--thread" for example to enable multi-threading support. |
866 | + |
867 | +DIRECTORY |
868 | + Specify the directory where the output source files will be stored. If |
869 | + ommitted, the source files will be stored in CMAKE_CURRENT_BINARY_DIR. |
870 | + |
871 | +CUSTOM_VAPIS |
872 | + A list of custom vapi files to be included for compilation. This can be |
873 | + useful to include freshly created vala libraries without having to install |
874 | + them in the system. |
875 | + |
876 | +GENERATE_VAPI |
877 | + Pass all the needed flags to the compiler to create an internal vapi for |
878 | + the compiled library. The provided name will be used for this and a |
879 | + <provided_name>.vapi file will be created. |
880 | + |
881 | +GENERATE_HEADER |
882 | + Let the compiler generate a header file for the compiled code. There will |
883 | + be a header file as well as an internal header file being generated called |
884 | + <provided_name>.h and <provided_name>_internal.h |
885 | + |
886 | +The following call is a simple example to the vala_precompile macro showing an |
887 | +example to every of the optional sections:: |
888 | + |
889 | + vala_precompile(VALA_C |
890 | + source1.vala |
891 | + source2.vala |
892 | + source3.vala |
893 | + PACKAGES |
894 | + gtk+-2.0 |
895 | + gio-1.0 |
896 | + posix |
897 | + OPTIONS |
898 | + --thread |
899 | + CUSTOM_VAPIS |
900 | + some_vapi.vapi |
901 | + GENERATE_VAPI |
902 | + myvapi |
903 | + GENERATE_HEADER |
904 | + myheader |
905 | + ) |
906 | + |
907 | +Most important is the variable VALA_C which will contain all the generated c |
908 | +file names after the call. The easiest way to use this information is to tell |
909 | +CMake to create an executable out of it. |
910 | + |
911 | +:: |
912 | + |
913 | + add_executable(myexecutable ${VALA_C}) |
914 | + |
915 | + |
916 | +Further reading |
917 | +=============== |
918 | + |
919 | +The `Pdf Presenter Console`__ , which is a vala based project of mine, makes |
920 | +heavy usage of the here described macros. To look at a real world example of |
921 | +these macros the mentioned project is the right place to take a look. The svn |
922 | +trunk of it can be found at:: |
923 | + |
924 | + svn://pureenergy.cc/pdf_presenter_console/trunk |
925 | + |
926 | + |
927 | +__ http://westhoffswelt.de/projects/pdf_presenter_console.html |
928 | + |
929 | + |
930 | +Acknowledgments |
931 | +=============== |
932 | + |
933 | +Thanks go out to Florian Sowade, a fellow local PHP-Usergroupie, who helped me |
934 | +a lot with the initial version of this macros and always answered my mostly |
935 | +dumb CMake questions. |
936 | + |
937 | +.. _CMake: http://cmake.org |
938 | +.. _Vala: http://live.gnome.org/Vala |
939 | +.. _Genie: http://live.gnome.org/Genie |
940 | + |
941 | + |
942 | + |
943 | |
944 | +.. |
945 | + Local Variables: |
946 | + mode: rst |
947 | + fill-column: 79 |
948 | + End: |
949 | + vim: et syn=rst tw=79 |
950 | |
951 | === removed file 'cmake/README.Vala.rst' |
952 | --- cmake/README.Vala.rst 2013-02-16 16:53:34 +0000 |
953 | +++ cmake/README.Vala.rst 1970-01-01 00:00:00 +0000 |
954 | @@ -1,173 +0,0 @@ |
955 | -========== |
956 | -Vala CMake |
957 | -========== |
958 | -:Author: |
959 | - Jakob Westhoff |
960 | -:Version: |
961 | - Draft |
962 | - |
963 | - |
964 | -Overview |
965 | -======== |
966 | - |
967 | -Vala CMake is a collection of macros for the CMake_ build system to allow the |
968 | -creation and management of projects developed using the Vala_ programming |
969 | -language or its "Genie" flavor (less tested). |
970 | - |
971 | - |
972 | -Installation |
973 | -============ |
974 | - |
975 | -To use the Vala macros in your own project you need to copy the macro files to |
976 | -an arbitrary folder in your projects directory and reference them in your |
977 | -``CMakeLists.txt`` file. |
978 | - |
979 | -Assuming the macros are stored under ``cmake/vala`` in your projects folder you |
980 | -need to add the following information to your base ``CMakeLists.txt``:: |
981 | - |
982 | - list(APPEND CMAKE_MODULE_PATH |
983 | - ${CMAKE_SOURCE_DIR}/cmake/vala |
984 | - ) |
985 | - |
986 | -After the new module path as been added you can simply include the provided |
987 | -modules or use the provided find routines. |
988 | - |
989 | - |
990 | -Finding Vala |
991 | -============ |
992 | - |
993 | -The find module for vala works like any other Find module in CMake. |
994 | -You can use it by simply calling the usual ``find_package`` function. Default |
995 | -parameters like ``REQUIRED`` and ``QUIETLY`` are supported. |
996 | - |
997 | -:: |
998 | - |
999 | - find_package(Vala REQUIRED) |
1000 | - |
1001 | -After a successful call to the find_package function the following variables |
1002 | -will be set: |
1003 | - |
1004 | -VALA_FOUND |
1005 | - Whether the vala compiler has been found or not |
1006 | - |
1007 | -VALA_EXECUTABLE |
1008 | - Full path to the valac executable if it has been found |
1009 | - |
1010 | -VALA_VERSION |
1011 | - Version number of the available valac |
1012 | - |
1013 | - |
1014 | -Precompiling Vala sources |
1015 | -========================= |
1016 | - |
1017 | -CMake is mainly supposed to handle c or c++ based projects. Luckily every vala |
1018 | -program is translated into plain c code using the vala compiler, followed by |
1019 | -normal compilation of the generated c program using gcc. |
1020 | - |
1021 | -The macro ``vala_precompile`` uses that fact to create c files from your .vala |
1022 | -sources for further CMake processing. |
1023 | - |
1024 | -The first parameter provided is a variable, which will be filled with a list of |
1025 | -c files outputted by the vala compiler. This list can than be used in |
1026 | -conjunction with functions like ``add_executable`` or others to create the |
1027 | -necessary compile rules with CMake. |
1028 | - |
1029 | -The initial variable is followed by a list of .vala files to be compiled. |
1030 | -Please take care to add every vala file belonging to the currently compiled |
1031 | -project or library as Vala will otherwise not be able to resolve all |
1032 | -dependencies. |
1033 | - |
1034 | -The following sections may be specified afterwards to provide certain options |
1035 | -to the vala compiler: |
1036 | - |
1037 | -PACKAGES |
1038 | - A list of vala packages/libraries to be used during the compile cycle. The |
1039 | - package names are exactly the same, as they would be passed to the valac |
1040 | - "--pkg=" option. |
1041 | - |
1042 | -OPTIONS |
1043 | - A list of optional options to be passed to the valac executable. This can be |
1044 | - used to pass "--thread" for example to enable multi-threading support. |
1045 | - |
1046 | -DIRECTORY |
1047 | - Specify the directory where the output source files will be stored. If |
1048 | - ommitted, the source files will be stored in CMAKE_CURRENT_BINARY_DIR. |
1049 | - |
1050 | -CUSTOM_VAPIS |
1051 | - A list of custom vapi files to be included for compilation. This can be |
1052 | - useful to include freshly created vala libraries without having to install |
1053 | - them in the system. |
1054 | - |
1055 | -GENERATE_VAPI |
1056 | - Pass all the needed flags to the compiler to create an internal vapi for |
1057 | - the compiled library. The provided name will be used for this and a |
1058 | - <provided_name>.vapi file will be created. |
1059 | - |
1060 | -GENERATE_HEADER |
1061 | - Let the compiler generate a header file for the compiled code. There will |
1062 | - be a header file as well as an internal header file being generated called |
1063 | - <provided_name>.h and <provided_name>_internal.h |
1064 | - |
1065 | -The following call is a simple example to the vala_precompile macro showing an |
1066 | -example to every of the optional sections:: |
1067 | - |
1068 | - vala_precompile(VALA_C |
1069 | - source1.vala |
1070 | - source2.vala |
1071 | - source3.vala |
1072 | - PACKAGES |
1073 | - gtk+-2.0 |
1074 | - gio-1.0 |
1075 | - posix |
1076 | - OPTIONS |
1077 | - --thread |
1078 | - CUSTOM_VAPIS |
1079 | - some_vapi.vapi |
1080 | - GENERATE_VAPI |
1081 | - myvapi |
1082 | - GENERATE_HEADER |
1083 | - myheader |
1084 | - ) |
1085 | - |
1086 | -Most important is the variable VALA_C which will contain all the generated c |
1087 | -file names after the call. The easiest way to use this information is to tell |
1088 | -CMake to create an executable out of it. |
1089 | - |
1090 | -:: |
1091 | - |
1092 | - add_executable(myexecutable ${VALA_C}) |
1093 | - |
1094 | - |
1095 | -Further reading |
1096 | -=============== |
1097 | - |
1098 | -The `Pdf Presenter Console`__ , which is a vala based project of mine, makes |
1099 | -heavy usage of the here described macros. To look at a real world example of |
1100 | -these macros the mentioned project is the right place to take a look. The svn |
1101 | -trunk of it can be found at:: |
1102 | - |
1103 | - svn://pureenergy.cc/pdf_presenter_console/trunk |
1104 | - |
1105 | - |
1106 | -__ http://westhoffswelt.de/projects/pdf_presenter_console.html |
1107 | - |
1108 | - |
1109 | -Acknowledgments |
1110 | -=============== |
1111 | - |
1112 | -Thanks go out to Florian Sowade, a fellow local PHP-Usergroupie, who helped me |
1113 | -a lot with the initial version of this macros and always answered my mostly |
1114 | -dumb CMake questions. |
1115 | - |
1116 | -.. _CMake: http://cmake.org |
1117 | -.. _Vala: http://live.gnome.org/Vala |
1118 | -.. _Genie: http://live.gnome.org/Genie |
1119 | - |
1120 | - |
1121 | - |
1122 | |
1123 | -.. |
1124 | - Local Variables: |
1125 | - mode: rst |
1126 | - fill-column: 79 |
1127 | - End: |
1128 | - vim: et syn=rst tw=79 |
1129 | |
1130 | === added file 'cmake/Tests.cmake' |
1131 | --- cmake/Tests.cmake 1970-01-01 00:00:00 +0000 |
1132 | +++ cmake/Tests.cmake 2014-10-14 15:21:32 +0000 |
1133 | @@ -0,0 +1,5 @@ |
1134 | +# Test macros for Marlin, feel free to re-use them. |
1135 | + |
1136 | +macro(add_test_executable EXE_NAME) |
1137 | + add_test(${EXE_NAME} gtester ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME}) |
1138 | +endmacro() |
1139 | |
1140 | === removed file 'cmake/Tests.cmake' |
1141 | --- cmake/Tests.cmake 2013-02-16 16:53:34 +0000 |
1142 | +++ cmake/Tests.cmake 1970-01-01 00:00:00 +0000 |
1143 | @@ -1,5 +0,0 @@ |
1144 | -# Test macros for Marlin, feel free to re-use them. |
1145 | - |
1146 | -macro(add_test_executable EXE_NAME) |
1147 | - add_test(${EXE_NAME} gtester ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME}) |
1148 | -endmacro() |
1149 | |
1150 | === added file 'cmake/Translations.cmake' |
1151 | --- cmake/Translations.cmake 1970-01-01 00:00:00 +0000 |
1152 | +++ cmake/Translations.cmake 2014-10-14 15:21:32 +0000 |
1153 | @@ -0,0 +1,76 @@ |
1154 | +# Translations.cmake, CMake macros written for Marlin, feel free to re-use them |
1155 | + |
1156 | +macro(add_translations_directory NLS_PACKAGE) |
1157 | + add_custom_target (i18n ALL COMMENT “Building i18n messages.”) |
1158 | + find_program (MSGFMT_EXECUTABLE msgfmt) |
1159 | + # be sure that all languages are present |
1160 | + set (LANGUAGES_NEEDED af am ar ast az be bg bn bs ca ckb cs da de el en_AU en_CA en_GB eo es et eu fa fi fr fr_CA gl he hi hr hu hy id it ja ka ko ky lb lo lt lv ml mr ms nb nl nn pl pt pt_BR ro ru rue si sk sl sma sq sr sv sw ta te th tr uk vi zh_CN zh_HK zh_TW) |
1161 | + foreach (LANGUAGE_NEEDED ${LANGUAGES_NEEDED}) |
1162 | + if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po) |
1163 | + file (APPEND ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po "msgid \"\"\n") |
1164 | + file (APPEND ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po "msgstr \"\"\n") |
1165 | + file (APPEND ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po "\"MIME-Version: 1.0\\n\"\n") |
1166 | + file (APPEND ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po "\"Content-Type: text/plain; charset=UTF-8\\n\"\n") |
1167 | + endif () |
1168 | + endforeach (LANGUAGE_NEEDED ${LANGUAGES_NEEDED}) |
1169 | + # generate .mo from .po |
1170 | + file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po) |
1171 | + foreach (PO_INPUT ${PO_FILES}) |
1172 | + get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE) |
1173 | + set (MO_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PO_INPUT_BASE}.mo) |
1174 | + add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT}) |
1175 | + |
1176 | + install (FILES ${MO_OUTPUT} DESTINATION |
1177 | + share/locale/${PO_INPUT_BASE}/LC_MESSAGES |
1178 | + RENAME ${NLS_PACKAGE}.mo) |
1179 | + endforeach (PO_INPUT ${PO_FILES}) |
1180 | +endmacro(add_translations_directory) |
1181 | + |
1182 | +macro(add_translations_catalog NLS_PACKAGE) |
1183 | + add_custom_target (pot COMMENT “Building translation catalog.”) |
1184 | + find_program (XGETTEXT_EXECUTABLE xgettext) |
1185 | + |
1186 | + set(C_SOURCE "") |
1187 | + set(VALA_SOURCE "") |
1188 | + set(GLADE_SOURCE "") |
1189 | + |
1190 | + foreach(FILES_INPUT ${ARGN}) |
1191 | + set(BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}) |
1192 | + |
1193 | + file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.c) |
1194 | + foreach(C_FILE ${SOURCE_FILES}) |
1195 | + set(C_SOURCE ${C_SOURCE} ${C_FILE}) |
1196 | + endforeach() |
1197 | + |
1198 | + file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.vala) |
1199 | + foreach(VALA_C_FILE ${SOURCE_FILES}) |
1200 | + set(VALA_SOURCE ${VALA_SOURCE} ${VALA_C_FILE}) |
1201 | + endforeach() |
1202 | + |
1203 | + file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.ui) |
1204 | + foreach(GLADE_C_FILE ${SOURCE_FILES}) |
1205 | + set(GLADE_SOURCE ${GLADE_SOURCE} ${GLADE_C_FILE}) |
1206 | + endforeach() |
1207 | + endforeach() |
1208 | + |
1209 | + set(BASE_XGETTEXT_COMMAND |
1210 | + ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} |
1211 | + -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot |
1212 | + --add-comments="/" --keyword="_" --keyword="N_" --keyword="C_:1c,2" --keyword="NC_:1c,2" --keyword="ngettext:1,2" --keyword="Q_:1g" --from-code=UTF-8) |
1213 | + |
1214 | + set(CONTINUE_FLAG "") |
1215 | + |
1216 | + IF(NOT "${C_SOURCE}" STREQUAL "") |
1217 | + add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${C_SOURCE}) |
1218 | + set(CONTINUE_FLAG "-j") |
1219 | + ENDIF() |
1220 | + |
1221 | + IF(NOT "${VALA_SOURCE}" STREQUAL "") |
1222 | + add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LC\# ${VALA_SOURCE}) |
1223 | + set(CONTINUE_FLAG "-j") |
1224 | + ENDIF() |
1225 | + |
1226 | + IF(NOT "${GLADE_SOURCE}" STREQUAL "") |
1227 | + add_custom_command (TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LGlade ${GLADE_SOURCE}) |
1228 | + ENDIF() |
1229 | +endmacro() |
1230 | \ No newline at end of file |
1231 | |
1232 | === removed file 'cmake/Translations.cmake' |
1233 | --- cmake/Translations.cmake 2013-02-16 16:53:34 +0000 |
1234 | +++ cmake/Translations.cmake 1970-01-01 00:00:00 +0000 |
1235 | @@ -1,41 +0,0 @@ |
1236 | -# Translations.cmake, CMake macros written for Marlin, feel free to re-use them |
1237 | - |
1238 | -macro(add_translations_directory NLS_PACKAGE) |
1239 | - add_custom_target (i18n ALL COMMENT “Building i18n messages.”) |
1240 | - find_program (MSGFMT_EXECUTABLE msgfmt) |
1241 | - file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po) |
1242 | - foreach (PO_INPUT ${PO_FILES}) |
1243 | - get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE) |
1244 | - set (MO_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PO_INPUT_BASE}.mo) |
1245 | - add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT}) |
1246 | - |
1247 | - install (FILES ${MO_OUTPUT} DESTINATION |
1248 | - share/locale/${PO_INPUT_BASE}/LC_MESSAGES |
1249 | - RENAME ${NLS_PACKAGE}.mo) |
1250 | - endforeach (PO_INPUT ${PO_FILES}) |
1251 | -endmacro(add_translations_directory) |
1252 | - |
1253 | - |
1254 | -macro(add_translations_catalog NLS_PACKAGE) |
1255 | - add_custom_target (pot COMMENT “Building translation catalog.”) |
1256 | - find_program (XGETTEXT_EXECUTABLE xgettext) |
1257 | - |
1258 | - |
1259 | - set(C_SOURCE "") |
1260 | - |
1261 | - foreach(FILES_INPUT ${ARGN}) |
1262 | - file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c) |
1263 | - foreach(C_FILE ${SOURCE_FILES}) |
1264 | - set(C_SOURCE ${C_SOURCE} ${C_FILE}) |
1265 | - endforeach() |
1266 | - file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala) |
1267 | - foreach(C_FILE ${SOURCE_FILES}) |
1268 | - set(C_SOURCE ${C_SOURCE} ${C_FILE}) |
1269 | - endforeach() |
1270 | - endforeach() |
1271 | - |
1272 | - add_custom_command (TARGET pot COMMAND |
1273 | - ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot |
1274 | - ${VALA_SOURCE} ${C_SOURCE} --from-code=UTF-8 --keyword="_" --keyword="N_" |
1275 | - ) |
1276 | -endmacro() |
1277 | |
1278 | === added file 'cmake/ValaPrecompile.cmake' |
1279 | --- cmake/ValaPrecompile.cmake 1970-01-01 00:00:00 +0000 |
1280 | +++ cmake/ValaPrecompile.cmake 2014-10-14 15:21:32 +0000 |
1281 | @@ -0,0 +1,250 @@ |
1282 | +## |
1283 | +# Copyright 2009-2010 Jakob Westhoff. All rights reserved. |
1284 | +# Copyright 2012 elementary. |
1285 | +# |
1286 | +# Redistribution and use in source and binary forms, with or without |
1287 | +# modification, are permitted provided that the following conditions are met: |
1288 | +# |
1289 | +# 1. Redistributions of source code must retain the above copyright notice, |
1290 | +# this list of conditions and the following disclaimer. |
1291 | +# |
1292 | +# 2. Redistributions in binary form must reproduce the above copyright notice, |
1293 | +# this list of conditions and the following disclaimer in the documentation |
1294 | +# and/or other materials provided with the distribution. |
1295 | +# |
1296 | +# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR |
1297 | +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
1298 | +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
1299 | +# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
1300 | +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
1301 | +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
1302 | +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF |
1303 | +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE |
1304 | +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
1305 | +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
1306 | +# |
1307 | +# The views and conclusions contained in the software and documentation are those |
1308 | +# of the authors and should not be interpreted as representing official policies, |
1309 | +# either expressed or implied, of Jakob Westhoff |
1310 | +## |
1311 | + |
1312 | +include(ParseArguments) |
1313 | +find_package(Vala REQUIRED) |
1314 | + |
1315 | +## |
1316 | +# Compile vala files to their c equivalents for further processing. |
1317 | +# |
1318 | +# The "vala_precompile" macro takes care of calling the valac executable on the |
1319 | +# given source to produce c files which can then be processed further using |
1320 | +# default cmake functions. |
1321 | +# |
1322 | +# The first parameter provided is a variable, which will be filled with a list |
1323 | +# of c files outputted by the vala compiler. This list can than be used in |
1324 | +# conjuction with functions like "add_executable" or others to create the |
1325 | +# neccessary compile rules with CMake. |
1326 | +# |
1327 | +# The initial variable is followed by a list of .vala files to be compiled. |
1328 | +# Please take care to add every vala file belonging to the currently compiled |
1329 | +# project or library as Vala will otherwise not be able to resolve all |
1330 | +# dependencies. |
1331 | +# |
1332 | +# The following sections may be specified afterwards to provide certain options |
1333 | +# to the vala compiler: |
1334 | +# |
1335 | +# PACKAGES |
1336 | +# A list of vala packages/libraries to be used during the compile cycle. The |
1337 | +# package names are exactly the same, as they would be passed to the valac |
1338 | +# "--pkg=" option. |
1339 | +# |
1340 | +# OPTIONS |
1341 | +# A list of optional options to be passed to the valac executable. This can be |
1342 | +# used to pass "--thread" for example to enable multi-threading support. |
1343 | +# |
1344 | +# CUSTOM_VAPIS |
1345 | +# A list of custom vapi files to be included for compilation. This can be |
1346 | +# useful to include freshly created vala libraries without having to install |
1347 | +# them in the system. |
1348 | +# |
1349 | +# GENERATE_VAPI |
1350 | +# Pass all the needed flags to the compiler to create an internal vapi for |
1351 | +# the compiled library. The provided name will be used for this and a |
1352 | +# <provided_name>.vapi file will be created. |
1353 | +# |
1354 | +# GENERATE_HEADER |
1355 | +# Let the compiler generate a header file for the compiled code. There will |
1356 | +# be a header file as well as an internal header file being generated called |
1357 | +# <provided_name>.h and <provided_name>_internal.h |
1358 | +# |
1359 | +# GENERATE_GIR |
1360 | +# Have the compiler generate a GObject-Introspection repository file with |
1361 | +# name: <provided_name>.gir. This can be later used to create a binary typelib |
1362 | +# using the GI compiler. |
1363 | +# |
1364 | +# GENERATE_SYMBOLS |
1365 | +# Output a <provided_name>.symbols file containing all the exported symbols. |
1366 | +# |
1367 | +# The following call is a simple example to the vala_precompile macro showing |
1368 | +# an example to every of the optional sections: |
1369 | +# |
1370 | +# vala_precompile(VALA_C mytargetname |
1371 | +# source1.vala |
1372 | +# source2.vala |
1373 | +# source3.vala |
1374 | +# PACKAGES |
1375 | +# gtk+-2.0 |
1376 | +# gio-1.0 |
1377 | +# posix |
1378 | +# DIRECTORY |
1379 | +# gen |
1380 | +# OPTIONS |
1381 | +# --thread |
1382 | +# CUSTOM_VAPIS |
1383 | +# some_vapi.vapi |
1384 | +# GENERATE_VAPI |
1385 | +# myvapi |
1386 | +# GENERATE_HEADER |
1387 | +# myheader |
1388 | +# GENERATE_GIR |
1389 | +# mygir |
1390 | +# GENERATE_SYMBOLS |
1391 | +# mysymbols |
1392 | +# ) |
1393 | +# |
1394 | +# Most important is the variable VALA_C which will contain all the generated c |
1395 | +# file names after the call. |
1396 | +## |
1397 | + |
1398 | +macro(vala_precompile output target_name) |
1399 | + parse_arguments(ARGS "TARGET;PACKAGES;OPTIONS;DIRECTORY;GENERATE_GIR;GENERATE_SYMBOLS;GENERATE_HEADER;GENERATE_VAPI;CUSTOM_VAPIS" "" ${ARGN}) |
1400 | + |
1401 | + if(ARGS_DIRECTORY) |
1402 | + set(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${ARGS_DIRECTORY}) |
1403 | + else(ARGS_DIRECTORY) |
1404 | + set(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) |
1405 | + endif(ARGS_DIRECTORY) |
1406 | + include_directories(${DIRECTORY}) |
1407 | + set(vala_pkg_opts "") |
1408 | + foreach(pkg ${ARGS_PACKAGES}) |
1409 | + list(APPEND vala_pkg_opts "--pkg=${pkg}") |
1410 | + endforeach(pkg ${ARGS_PACKAGES}) |
1411 | + set(in_files "") |
1412 | + set(out_files "") |
1413 | + set(out_files_display "") |
1414 | + set(${output} "") |
1415 | + |
1416 | + foreach(src ${ARGS_DEFAULT_ARGS}) |
1417 | + string(REGEX MATCH "^/" IS_MATCHED ${src}) |
1418 | + if(${IS_MATCHED} MATCHES "/") |
1419 | + set(src_file_path ${src}) |
1420 | + else() |
1421 | + set(src_file_path ${CMAKE_CURRENT_SOURCE_DIR}/${src}) |
1422 | + endif() |
1423 | + list(APPEND in_files ${src_file_path}) |
1424 | + string(REPLACE ".vala" ".c" src ${src}) |
1425 | + string(REPLACE ".gs" ".c" src ${src}) |
1426 | + if(${IS_MATCHED} MATCHES "/") |
1427 | + get_filename_component(VALA_FILE_NAME ${src} NAME) |
1428 | + set(out_file "${CMAKE_CURRENT_BINARY_DIR}/${VALA_FILE_NAME}") |
1429 | + list(APPEND out_files "${CMAKE_CURRENT_BINARY_DIR}/${VALA_FILE_NAME}") |
1430 | + else() |
1431 | + set(out_file "${DIRECTORY}/${src}") |
1432 | + list(APPEND out_files "${DIRECTORY}/${src}") |
1433 | + endif() |
1434 | + list(APPEND ${output} ${out_file}) |
1435 | + list(APPEND out_files_display "${src}") |
1436 | + endforeach(src ${ARGS_DEFAULT_ARGS}) |
1437 | + |
1438 | + set(custom_vapi_arguments "") |
1439 | + if(ARGS_CUSTOM_VAPIS) |
1440 | + foreach(vapi ${ARGS_CUSTOM_VAPIS}) |
1441 | + if(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR}) |
1442 | + list(APPEND custom_vapi_arguments ${vapi}) |
1443 | + else (${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR}) |
1444 | + list(APPEND custom_vapi_arguments ${CMAKE_CURRENT_SOURCE_DIR}/${vapi}) |
1445 | + endif(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR}) |
1446 | + endforeach(vapi ${ARGS_CUSTOM_VAPIS}) |
1447 | + endif(ARGS_CUSTOM_VAPIS) |
1448 | + |
1449 | + set(vapi_arguments "") |
1450 | + if(ARGS_GENERATE_VAPI) |
1451 | + list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_VAPI}.vapi") |
1452 | + list(APPEND out_files_display "${ARGS_GENERATE_VAPI}.vapi") |
1453 | + set(vapi_arguments "--library=${ARGS_GENERATE_VAPI}" "--vapi=${ARGS_GENERATE_VAPI}.vapi") |
1454 | + |
1455 | + # Header and internal header is needed to generate internal vapi |
1456 | + if (NOT ARGS_GENERATE_HEADER) |
1457 | + set(ARGS_GENERATE_HEADER ${ARGS_GENERATE_VAPI}) |
1458 | + endif(NOT ARGS_GENERATE_HEADER) |
1459 | + endif(ARGS_GENERATE_VAPI) |
1460 | + |
1461 | + set(header_arguments "") |
1462 | + if(ARGS_GENERATE_HEADER) |
1463 | + list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}.h") |
1464 | + list(APPEND out_files_display "${ARGS_GENERATE_HEADER}.h") |
1465 | + list(APPEND header_arguments "--header=${ARGS_GENERATE_HEADER}.h") |
1466 | + endif(ARGS_GENERATE_HEADER) |
1467 | + |
1468 | + set(gir_arguments "") |
1469 | + set(gircomp_command "") |
1470 | + if(ARGS_GENERATE_GIR) |
1471 | + list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir") |
1472 | + list(APPEND out_files_display "${ARGS_GENERATE_GIR}.gir") |
1473 | + set(gir_arguments "--gir=${ARGS_GENERATE_GIR}.gir") |
1474 | + |
1475 | + include (FindGirCompiler) |
1476 | + find_package(GirCompiler REQUIRED) |
1477 | + |
1478 | + set(gircomp_command |
1479 | + COMMAND |
1480 | + ${G_IR_COMPILER_EXECUTABLE} |
1481 | + ARGS |
1482 | + "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir" |
1483 | + -o "${DIRECTORY}/${ARGS_GENERATE_GIR}.typelib") |
1484 | + endif(ARGS_GENERATE_GIR) |
1485 | + |
1486 | + set(symbols_arguments "") |
1487 | + if(ARGS_GENERATE_SYMBOLS) |
1488 | + list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_SYMBOLS}.symbols") |
1489 | + list(APPEND out_files_display "${ARGS_GENERATE_SYMBOLS}.symbols") |
1490 | + set(symbols_arguments "--symbols=${ARGS_GENERATE_SYMBOLS}.symbols") |
1491 | + endif(ARGS_GENERATE_SYMBOLS) |
1492 | + |
1493 | + # Workaround for a bug that would make valac run twice. This file is written |
1494 | + # after the vala compiler generates C source code. |
1495 | + set(OUTPUT_STAMP ${CMAKE_CURRENT_BINARY_DIR}/${target_name}_valac.stamp) |
1496 | + |
1497 | + add_custom_command( |
1498 | + OUTPUT |
1499 | + ${OUTPUT_STAMP} |
1500 | + COMMAND |
1501 | + ${VALA_EXECUTABLE} |
1502 | + ARGS |
1503 | + "-C" |
1504 | + ${header_arguments} |
1505 | + ${vapi_arguments} |
1506 | + ${gir_arguments} |
1507 | + ${symbols_arguments} |
1508 | + "-b" ${CMAKE_CURRENT_SOURCE_DIR} |
1509 | + "-d" ${DIRECTORY} |
1510 | + ${vala_pkg_opts} |
1511 | + ${ARGS_OPTIONS} |
1512 | + "-g" |
1513 | + "--save-temps" |
1514 | + ${in_files} |
1515 | + ${custom_vapi_arguments} |
1516 | + COMMAND |
1517 | + touch |
1518 | + ARGS |
1519 | + ${OUTPUT_STAMP} |
1520 | + DEPENDS |
1521 | + ${in_files} |
1522 | + ${ARGS_CUSTOM_VAPIS} |
1523 | + COMMENT |
1524 | + "Generating ${out_files_display}" |
1525 | + ${gircomp_command} |
1526 | + ) |
1527 | + |
1528 | + # This command will be run twice for some reason (pass a non-empty string to COMMENT |
1529 | + # in order to see it). Since valac is not executed from here, this won't be a problem. |
1530 | + add_custom_command(OUTPUT ${out_files} DEPENDS ${OUTPUT_STAMP} COMMENT "") |
1531 | +endmacro(vala_precompile) |
1532 | |
1533 | === removed file 'cmake/ValaPrecompile.cmake' |
1534 | --- cmake/ValaPrecompile.cmake 2013-02-16 16:53:34 +0000 |
1535 | +++ cmake/ValaPrecompile.cmake 1970-01-01 00:00:00 +0000 |
1536 | @@ -1,175 +0,0 @@ |
1537 | -## |
1538 | -# Copyright 2009-2010 Jakob Westhoff. All rights reserved. |
1539 | -# |
1540 | -# Redistribution and use in source and binary forms, with or without |
1541 | -# modification, are permitted provided that the following conditions are met: |
1542 | -# |
1543 | -# 1. Redistributions of source code must retain the above copyright notice, |
1544 | -# this list of conditions and the following disclaimer. |
1545 | -# |
1546 | -# 2. Redistributions in binary form must reproduce the above copyright notice, |
1547 | -# this list of conditions and the following disclaimer in the documentation |
1548 | -# and/or other materials provided with the distribution. |
1549 | -# |
1550 | -# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR |
1551 | -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
1552 | -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
1553 | -# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
1554 | -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
1555 | -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
1556 | -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF |
1557 | -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE |
1558 | -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
1559 | -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
1560 | -# |
1561 | -# The views and conclusions contained in the software and documentation are those |
1562 | -# of the authors and should not be interpreted as representing official policies, |
1563 | -# either expressed or implied, of Jakob Westhoff |
1564 | -## |
1565 | - |
1566 | -include(ParseArguments) |
1567 | -find_package(Vala REQUIRED) |
1568 | - |
1569 | -## |
1570 | -# Compile vala files to their c equivalents for further processing. |
1571 | -# |
1572 | -# The "vala_precompile" macro takes care of calling the valac executable on the |
1573 | -# given source to produce c files which can then be processed further using |
1574 | -# default cmake functions. |
1575 | -# |
1576 | -# The first parameter provided is a variable, which will be filled with a list |
1577 | -# of c files outputted by the vala compiler. This list can than be used in |
1578 | -# conjuction with functions like "add_executable" or others to create the |
1579 | -# neccessary compile rules with CMake. |
1580 | -# |
1581 | -# The initial variable is followed by a list of .vala files to be compiled. |
1582 | -# Please take care to add every vala file belonging to the currently compiled |
1583 | -# project or library as Vala will otherwise not be able to resolve all |
1584 | -# dependencies. |
1585 | -# |
1586 | -# The following sections may be specified afterwards to provide certain options |
1587 | -# to the vala compiler: |
1588 | -# |
1589 | -# PACKAGES |
1590 | -# A list of vala packages/libraries to be used during the compile cycle. The |
1591 | -# package names are exactly the same, as they would be passed to the valac |
1592 | -# "--pkg=" option. |
1593 | -# |
1594 | -# OPTIONS |
1595 | -# A list of optional options to be passed to the valac executable. This can be |
1596 | -# used to pass "--thread" for example to enable multi-threading support. |
1597 | -# |
1598 | -# CUSTOM_VAPIS |
1599 | -# A list of custom vapi files to be included for compilation. This can be |
1600 | -# useful to include freshly created vala libraries without having to install |
1601 | -# them in the system. |
1602 | -# |
1603 | -# GENERATE_VAPI |
1604 | -# Pass all the needed flags to the compiler to create an internal vapi for |
1605 | -# the compiled library. The provided name will be used for this and a |
1606 | -# <provided_name>.vapi file will be created. |
1607 | -# |
1608 | -# GENERATE_HEADER |
1609 | -# Let the compiler generate a header file for the compiled code. There will |
1610 | -# be a header file as well as an internal header file being generated called |
1611 | -# <provided_name>.h and <provided_name>_internal.h |
1612 | -# |
1613 | -# The following call is a simple example to the vala_precompile macro showing |
1614 | -# an example to every of the optional sections: |
1615 | -# |
1616 | -# vala_precompile(VALA_C |
1617 | -# source1.vala |
1618 | -# source2.vala |
1619 | -# source3.vala |
1620 | -# PACKAGES |
1621 | -# gtk+-2.0 |
1622 | -# gio-1.0 |
1623 | -# posix |
1624 | -# DIRECTORY |
1625 | -# gen |
1626 | -# OPTIONS |
1627 | -# --thread |
1628 | -# CUSTOM_VAPIS |
1629 | -# some_vapi.vapi |
1630 | -# GENERATE_VAPI |
1631 | -# myvapi |
1632 | -# GENERATE_HEADER |
1633 | -# myheader |
1634 | -# ) |
1635 | -# |
1636 | -# Most important is the variable VALA_C which will contain all the generated c |
1637 | -# file names after the call. |
1638 | -## |
1639 | - |
1640 | -macro(vala_precompile output) |
1641 | - parse_arguments(ARGS "PACKAGES;OPTIONS;DIRECTORY;GENERATE_HEADER;GENERATE_VAPI;CUSTOM_VAPIS" "" ${ARGN}) |
1642 | - if(ARGS_DIRECTORY) |
1643 | - set(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${ARGS_DIRECTORY}) |
1644 | - else(ARGS_DIRECTORY) |
1645 | - set(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) |
1646 | - endif(ARGS_DIRECTORY) |
1647 | - include_directories(${DIRECTORY}) |
1648 | - set(vala_pkg_opts "") |
1649 | - foreach(pkg ${ARGS_PACKAGES}) |
1650 | - list(APPEND vala_pkg_opts "--pkg=${pkg}") |
1651 | - endforeach(pkg ${ARGS_PACKAGES}) |
1652 | - set(in_files "") |
1653 | - set(out_files "") |
1654 | - set(${output} "") |
1655 | - foreach(src ${ARGS_DEFAULT_ARGS}) |
1656 | - list(APPEND in_files "${CMAKE_CURRENT_SOURCE_DIR}/${src}") |
1657 | - string(REPLACE ".vala" ".c" src ${src}) |
1658 | - string(REPLACE ".gs" ".c" src ${src}) |
1659 | - set(out_file "${DIRECTORY}/${src}") |
1660 | - list(APPEND out_files "${DIRECTORY}/${src}") |
1661 | - list(APPEND ${output} ${out_file}) |
1662 | - endforeach(src ${ARGS_DEFAULT_ARGS}) |
1663 | - |
1664 | - set(custom_vapi_arguments "") |
1665 | - if(ARGS_CUSTOM_VAPIS) |
1666 | - foreach(vapi ${ARGS_CUSTOM_VAPIS}) |
1667 | - if(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR}) |
1668 | - list(APPEND custom_vapi_arguments ${vapi}) |
1669 | - else (${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR}) |
1670 | - list(APPEND custom_vapi_arguments ${CMAKE_CURRENT_SOURCE_DIR}/${vapi}) |
1671 | - endif(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR}) |
1672 | - endforeach(vapi ${ARGS_CUSTOM_VAPIS}) |
1673 | - endif(ARGS_CUSTOM_VAPIS) |
1674 | - |
1675 | - set(vapi_arguments "") |
1676 | - if(ARGS_GENERATE_VAPI) |
1677 | - list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_VAPI}.vapi") |
1678 | - set(vapi_arguments "--internal-vapi=${ARGS_GENERATE_VAPI}.vapi") |
1679 | - |
1680 | - # Header and internal header is needed to generate internal vapi |
1681 | - if (NOT ARGS_GENERATE_HEADER) |
1682 | - set(ARGS_GENERATE_HEADER ${ARGS_GENERATE_VAPI}) |
1683 | - endif(NOT ARGS_GENERATE_HEADER) |
1684 | - endif(ARGS_GENERATE_VAPI) |
1685 | - |
1686 | - set(header_arguments "") |
1687 | - if(ARGS_GENERATE_HEADER) |
1688 | - list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}.h") |
1689 | - list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}_internal.h") |
1690 | - list(APPEND header_arguments "--header=${DIRECTORY}/${ARGS_GENERATE_HEADER}.h") |
1691 | - list(APPEND header_arguments "--internal-header=${DIRECTORY}/${ARGS_GENERATE_HEADER}_internal.h") |
1692 | - endif(ARGS_GENERATE_HEADER) |
1693 | - |
1694 | - add_custom_command(OUTPUT ${out_files} |
1695 | - COMMAND |
1696 | - ${VALA_EXECUTABLE} |
1697 | - ARGS |
1698 | - "-C" |
1699 | - ${header_arguments} |
1700 | - ${vapi_arguments} |
1701 | - "-b" ${CMAKE_CURRENT_SOURCE_DIR} |
1702 | - "-d" ${DIRECTORY} |
1703 | - ${vala_pkg_opts} |
1704 | - ${ARGS_OPTIONS} |
1705 | - ${in_files} |
1706 | - ${custom_vapi_arguments} |
1707 | - DEPENDS |
1708 | - ${in_files} |
1709 | - ${ARGS_CUSTOM_VAPIS} |
1710 | - ) |
1711 | -endmacro(vala_precompile) |
1712 | |
1713 | === added file 'cmake/ValaVersion.cmake' |
1714 | --- cmake/ValaVersion.cmake 1970-01-01 00:00:00 +0000 |
1715 | +++ cmake/ValaVersion.cmake 2014-10-14 15:21:32 +0000 |
1716 | @@ -0,0 +1,96 @@ |
1717 | +## |
1718 | +# Copyright 2009-2010 Jakob Westhoff. All rights reserved. |
1719 | +# |
1720 | +# Redistribution and use in source and binary forms, with or without |
1721 | +# modification, are permitted provided that the following conditions are met: |
1722 | +# |
1723 | +# 1. Redistributions of source code must retain the above copyright notice, |
1724 | +# this list of conditions and the following disclaimer. |
1725 | +# |
1726 | +# 2. Redistributions in binary form must reproduce the above copyright notice, |
1727 | +# this list of conditions and the following disclaimer in the documentation |
1728 | +# and/or other materials provided with the distribution. |
1729 | +# |
1730 | +# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR |
1731 | +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
1732 | +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
1733 | +# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
1734 | +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
1735 | +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
1736 | +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF |
1737 | +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE |
1738 | +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
1739 | +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
1740 | +# |
1741 | +# The views and conclusions contained in the software and documentation are those |
1742 | +# of the authors and should not be interpreted as representing official policies, |
1743 | +# either expressed or implied, of Jakob Westhoff |
1744 | +## |
1745 | + |
1746 | +include(ParseArguments) |
1747 | +find_package(Vala REQUIRED) |
1748 | + |
1749 | +## |
1750 | +# Ensure a certain valac version is available |
1751 | +# |
1752 | +# The initial argument is the version to check for |
1753 | +# |
1754 | +# It may be followed by a optional parameter to specifiy a version range. The |
1755 | +# following options are valid: |
1756 | +# |
1757 | +# EXACT |
1758 | +# Vala needs to be available in the exact version given |
1759 | +# |
1760 | +# MINIMUM |
1761 | +# The provided version is the minimum version. Therefore Vala needs to be |
1762 | +# available in the given version or any higher version |
1763 | +# |
1764 | +# MAXIMUM |
1765 | +# The provided version is the maximum. Therefore Vala needs to be available |
1766 | +# in the given version or any version older than this |
1767 | +# |
1768 | +# If no option is specified the version will be treated as a minimal version. |
1769 | +## |
1770 | +macro(ensure_vala_version version) |
1771 | + parse_arguments(ARGS "" "MINIMUM;MAXIMUM;EXACT" ${ARGN}) |
1772 | + set(compare_message "") |
1773 | + set(error_message "") |
1774 | + if(ARGS_MINIMUM) |
1775 | + set(compare_message "a minimum ") |
1776 | + set(error_message "or greater ") |
1777 | + elseif(ARGS_MAXIMUM) |
1778 | + set(compare_message "a maximum ") |
1779 | + set(error_message "or less ") |
1780 | + endif(ARGS_MINIMUM) |
1781 | + |
1782 | + message(STATUS |
1783 | + "checking for ${compare_message}Vala version of ${version}" |
1784 | + ) |
1785 | + |
1786 | + unset(version_accepted) |
1787 | + |
1788 | + # MINIMUM is the default if no option is specified |
1789 | + if(ARGS_EXACT) |
1790 | + if(${VALA_VERSION} VERSION_EQUAL ${version} ) |
1791 | + set(version_accepted TRUE) |
1792 | + endif(${VALA_VERSION} VERSION_EQUAL ${version}) |
1793 | + elseif(ARGS_MAXIMUM) |
1794 | + if(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version}) |
1795 | + set(version_accepted TRUE) |
1796 | + endif(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version}) |
1797 | + else(ARGS_MAXIMUM) |
1798 | + if(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version}) |
1799 | + set(version_accepted TRUE) |
1800 | + endif(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version}) |
1801 | + endif(ARGS_EXACT) |
1802 | + |
1803 | + if (NOT version_accepted) |
1804 | + message(FATAL_ERROR |
1805 | + "Vala version ${version} ${error_message}is required." |
1806 | + ) |
1807 | + endif(NOT version_accepted) |
1808 | + |
1809 | + message(STATUS |
1810 | + " found Vala, version ${VALA_VERSION}" |
1811 | + ) |
1812 | +endmacro(ensure_vala_version) |
1813 | |
1814 | === removed file 'cmake/ValaVersion.cmake' |
1815 | --- cmake/ValaVersion.cmake 2013-02-16 16:53:34 +0000 |
1816 | +++ cmake/ValaVersion.cmake 1970-01-01 00:00:00 +0000 |
1817 | @@ -1,96 +0,0 @@ |
1818 | -## |
1819 | -# Copyright 2009-2010 Jakob Westhoff. All rights reserved. |
1820 | -# |
1821 | -# Redistribution and use in source and binary forms, with or without |
1822 | -# modification, are permitted provided that the following conditions are met: |
1823 | -# |
1824 | -# 1. Redistributions of source code must retain the above copyright notice, |
1825 | -# this list of conditions and the following disclaimer. |
1826 | -# |
1827 | -# 2. Redistributions in binary form must reproduce the above copyright notice, |
1828 | -# this list of conditions and the following disclaimer in the documentation |
1829 | -# and/or other materials provided with the distribution. |
1830 | -# |
1831 | -# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR |
1832 | -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
1833 | -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
1834 | -# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
1835 | -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
1836 | -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
1837 | -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF |
1838 | -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE |
1839 | -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
1840 | -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
1841 | -# |
1842 | -# The views and conclusions contained in the software and documentation are those |
1843 | -# of the authors and should not be interpreted as representing official policies, |
1844 | -# either expressed or implied, of Jakob Westhoff |
1845 | -## |
1846 | - |
1847 | -include(ParseArguments) |
1848 | -find_package(Vala REQUIRED) |
1849 | - |
1850 | -## |
1851 | -# Ensure a certain valac version is available |
1852 | -# |
1853 | -# The initial argument is the version to check for |
1854 | -# |
1855 | -# It may be followed by a optional parameter to specifiy a version range. The |
1856 | -# following options are valid: |
1857 | -# |
1858 | -# EXACT |
1859 | -# Vala needs to be available in the exact version given |
1860 | -# |
1861 | -# MINIMUM |
1862 | -# The provided version is the minimum version. Therefore Vala needs to be |
1863 | -# available in the given version or any higher version |
1864 | -# |
1865 | -# MAXIMUM |
1866 | -# The provided version is the maximum. Therefore Vala needs to be available |
1867 | -# in the given version or any version older than this |
1868 | -# |
1869 | -# If no option is specified the version will be treated as a minimal version. |
1870 | -## |
1871 | -macro(ensure_vala_version version) |
1872 | - parse_arguments(ARGS "" "MINIMUM;MAXIMUM;EXACT" ${ARGN}) |
1873 | - set(compare_message "") |
1874 | - set(error_message "") |
1875 | - if(ARGS_MINIMUM) |
1876 | - set(compare_message "a minimum ") |
1877 | - set(error_message "or greater ") |
1878 | - elseif(ARGS_MAXIMUM) |
1879 | - set(compare_message "a maximum ") |
1880 | - set(error_message "or less ") |
1881 | - endif(ARGS_MINIMUM) |
1882 | - |
1883 | - message(STATUS |
1884 | - "checking for ${compare_message}Vala version of ${version}" |
1885 | - ) |
1886 | - |
1887 | - unset(version_accepted) |
1888 | - |
1889 | - # MINIMUM is the default if no option is specified |
1890 | - if(ARGS_EXACT) |
1891 | - if(${VALA_VERSION} VERSION_EQUAL ${version} ) |
1892 | - set(version_accepted TRUE) |
1893 | - endif(${VALA_VERSION} VERSION_EQUAL ${version}) |
1894 | - elseif(ARGS_MAXIMUM) |
1895 | - if(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version}) |
1896 | - set(version_accepted TRUE) |
1897 | - endif(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version}) |
1898 | - else(ARGS_MAXIMUM) |
1899 | - if(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version}) |
1900 | - set(version_accepted TRUE) |
1901 | - endif(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version}) |
1902 | - endif(ARGS_EXACT) |
1903 | - |
1904 | - if (NOT version_accepted) |
1905 | - message(FATAL_ERROR |
1906 | - "Vala version ${version} ${error_message}is required." |
1907 | - ) |
1908 | - endif(NOT version_accepted) |
1909 | - |
1910 | - message(STATUS |
1911 | - " found Vala, version ${VALA_VERSION}" |
1912 | - ) |
1913 | -endmacro(ensure_vala_version) |
1914 | |
1915 | === added file 'po/af.po' |
1916 | --- po/af.po 1970-01-01 00:00:00 +0000 |
1917 | +++ po/af.po 2014-10-14 15:21:32 +0000 |
1918 | @@ -0,0 +1,4 @@ |
1919 | +msgid "" |
1920 | +msgstr "" |
1921 | +"MIME-Version: 1.0\n" |
1922 | +"Content-Type: text/plain; charset=UTF-8\n" |
1923 | |
1924 | === added file 'po/am.po' |
1925 | --- po/am.po 1970-01-01 00:00:00 +0000 |
1926 | +++ po/am.po 2014-10-14 15:21:32 +0000 |
1927 | @@ -0,0 +1,4 @@ |
1928 | +msgid "" |
1929 | +msgstr "" |
1930 | +"MIME-Version: 1.0\n" |
1931 | +"Content-Type: text/plain; charset=UTF-8\n" |
1932 | |
1933 | === added file 'po/ar.po' |
1934 | --- po/ar.po 1970-01-01 00:00:00 +0000 |
1935 | +++ po/ar.po 2014-10-14 15:21:32 +0000 |
1936 | @@ -0,0 +1,4 @@ |
1937 | +msgid "" |
1938 | +msgstr "" |
1939 | +"MIME-Version: 1.0\n" |
1940 | +"Content-Type: text/plain; charset=UTF-8\n" |
1941 | |
1942 | === added file 'po/ast.po' |
1943 | --- po/ast.po 1970-01-01 00:00:00 +0000 |
1944 | +++ po/ast.po 2014-10-14 15:21:32 +0000 |
1945 | @@ -0,0 +1,4 @@ |
1946 | +msgid "" |
1947 | +msgstr "" |
1948 | +"MIME-Version: 1.0\n" |
1949 | +"Content-Type: text/plain; charset=UTF-8\n" |
1950 | |
1951 | === added file 'po/az.po' |
1952 | --- po/az.po 1970-01-01 00:00:00 +0000 |
1953 | +++ po/az.po 2014-10-14 15:21:32 +0000 |
1954 | @@ -0,0 +1,4 @@ |
1955 | +msgid "" |
1956 | +msgstr "" |
1957 | +"MIME-Version: 1.0\n" |
1958 | +"Content-Type: text/plain; charset=UTF-8\n" |
1959 | |
1960 | === added file 'po/be.po' |
1961 | --- po/be.po 1970-01-01 00:00:00 +0000 |
1962 | +++ po/be.po 2014-10-14 15:21:32 +0000 |
1963 | @@ -0,0 +1,4 @@ |
1964 | +msgid "" |
1965 | +msgstr "" |
1966 | +"MIME-Version: 1.0\n" |
1967 | +"Content-Type: text/plain; charset=UTF-8\n" |
1968 | |
1969 | === added file 'po/bg.po' |
1970 | --- po/bg.po 1970-01-01 00:00:00 +0000 |
1971 | +++ po/bg.po 2014-10-14 15:21:32 +0000 |
1972 | @@ -0,0 +1,4 @@ |
1973 | +msgid "" |
1974 | +msgstr "" |
1975 | +"MIME-Version: 1.0\n" |
1976 | +"Content-Type: text/plain; charset=UTF-8\n" |
1977 | |
1978 | === added file 'po/bn.po' |
1979 | --- po/bn.po 1970-01-01 00:00:00 +0000 |
1980 | +++ po/bn.po 2014-10-14 15:21:32 +0000 |
1981 | @@ -0,0 +1,4 @@ |
1982 | +msgid "" |
1983 | +msgstr "" |
1984 | +"MIME-Version: 1.0\n" |
1985 | +"Content-Type: text/plain; charset=UTF-8\n" |
1986 | |
1987 | === added file 'po/bs.po' |
1988 | --- po/bs.po 1970-01-01 00:00:00 +0000 |
1989 | +++ po/bs.po 2014-10-14 15:21:32 +0000 |
1990 | @@ -0,0 +1,4 @@ |
1991 | +msgid "" |
1992 | +msgstr "" |
1993 | +"MIME-Version: 1.0\n" |
1994 | +"Content-Type: text/plain; charset=UTF-8\n" |
1995 | |
1996 | === added file 'po/ca.po' |
1997 | --- po/ca.po 1970-01-01 00:00:00 +0000 |
1998 | +++ po/ca.po 2014-10-14 15:21:32 +0000 |
1999 | @@ -0,0 +1,4 @@ |
2000 | +msgid "" |
2001 | +msgstr "" |
2002 | +"MIME-Version: 1.0\n" |
2003 | +"Content-Type: text/plain; charset=UTF-8\n" |
2004 | |
2005 | === added file 'po/ckb.po' |
2006 | --- po/ckb.po 1970-01-01 00:00:00 +0000 |
2007 | +++ po/ckb.po 2014-10-14 15:21:32 +0000 |
2008 | @@ -0,0 +1,4 @@ |
2009 | +msgid "" |
2010 | +msgstr "" |
2011 | +"MIME-Version: 1.0\n" |
2012 | +"Content-Type: text/plain; charset=UTF-8\n" |
2013 | |
2014 | === added file 'po/cs.po' |
2015 | --- po/cs.po 1970-01-01 00:00:00 +0000 |
2016 | +++ po/cs.po 2014-10-14 15:21:32 +0000 |
2017 | @@ -0,0 +1,4 @@ |
2018 | +msgid "" |
2019 | +msgstr "" |
2020 | +"MIME-Version: 1.0\n" |
2021 | +"Content-Type: text/plain; charset=UTF-8\n" |
2022 | |
2023 | === added file 'po/da.po' |
2024 | --- po/da.po 1970-01-01 00:00:00 +0000 |
2025 | +++ po/da.po 2014-10-14 15:21:32 +0000 |
2026 | @@ -0,0 +1,4 @@ |
2027 | +msgid "" |
2028 | +msgstr "" |
2029 | +"MIME-Version: 1.0\n" |
2030 | +"Content-Type: text/plain; charset=UTF-8\n" |
2031 | |
2032 | === added file 'po/de.po' |
2033 | --- po/de.po 1970-01-01 00:00:00 +0000 |
2034 | +++ po/de.po 2014-10-14 15:21:32 +0000 |
2035 | @@ -0,0 +1,4 @@ |
2036 | +msgid "" |
2037 | +msgstr "" |
2038 | +"MIME-Version: 1.0\n" |
2039 | +"Content-Type: text/plain; charset=UTF-8\n" |
2040 | |
2041 | === added file 'po/el.po' |
2042 | --- po/el.po 1970-01-01 00:00:00 +0000 |
2043 | +++ po/el.po 2014-10-14 15:21:32 +0000 |
2044 | @@ -0,0 +1,4 @@ |
2045 | +msgid "" |
2046 | +msgstr "" |
2047 | +"MIME-Version: 1.0\n" |
2048 | +"Content-Type: text/plain; charset=UTF-8\n" |
2049 | |
2050 | === added file 'po/en_AU.po' |
2051 | --- po/en_AU.po 1970-01-01 00:00:00 +0000 |
2052 | +++ po/en_AU.po 2014-10-14 15:21:32 +0000 |
2053 | @@ -0,0 +1,4 @@ |
2054 | +msgid "" |
2055 | +msgstr "" |
2056 | +"MIME-Version: 1.0\n" |
2057 | +"Content-Type: text/plain; charset=UTF-8\n" |
2058 | |
2059 | === added file 'po/en_CA.po' |
2060 | --- po/en_CA.po 1970-01-01 00:00:00 +0000 |
2061 | +++ po/en_CA.po 2014-10-14 15:21:32 +0000 |
2062 | @@ -0,0 +1,4 @@ |
2063 | +msgid "" |
2064 | +msgstr "" |
2065 | +"MIME-Version: 1.0\n" |
2066 | +"Content-Type: text/plain; charset=UTF-8\n" |
2067 | |
2068 | === added file 'po/en_GB.po' |
2069 | --- po/en_GB.po 1970-01-01 00:00:00 +0000 |
2070 | +++ po/en_GB.po 2014-10-14 15:21:32 +0000 |
2071 | @@ -0,0 +1,4 @@ |
2072 | +msgid "" |
2073 | +msgstr "" |
2074 | +"MIME-Version: 1.0\n" |
2075 | +"Content-Type: text/plain; charset=UTF-8\n" |
2076 | |
2077 | === added file 'po/eo.po' |
2078 | --- po/eo.po 1970-01-01 00:00:00 +0000 |
2079 | +++ po/eo.po 2014-10-14 15:21:32 +0000 |
2080 | @@ -0,0 +1,4 @@ |
2081 | +msgid "" |
2082 | +msgstr "" |
2083 | +"MIME-Version: 1.0\n" |
2084 | +"Content-Type: text/plain; charset=UTF-8\n" |
2085 | |
2086 | === added file 'po/es.po' |
2087 | --- po/es.po 1970-01-01 00:00:00 +0000 |
2088 | +++ po/es.po 2014-10-14 15:21:32 +0000 |
2089 | @@ -0,0 +1,4 @@ |
2090 | +msgid "" |
2091 | +msgstr "" |
2092 | +"MIME-Version: 1.0\n" |
2093 | +"Content-Type: text/plain; charset=UTF-8\n" |
2094 | |
2095 | === added file 'po/et.po' |
2096 | --- po/et.po 1970-01-01 00:00:00 +0000 |
2097 | +++ po/et.po 2014-10-14 15:21:32 +0000 |
2098 | @@ -0,0 +1,4 @@ |
2099 | +msgid "" |
2100 | +msgstr "" |
2101 | +"MIME-Version: 1.0\n" |
2102 | +"Content-Type: text/plain; charset=UTF-8\n" |
2103 | |
2104 | === added file 'po/eu.po' |
2105 | --- po/eu.po 1970-01-01 00:00:00 +0000 |
2106 | +++ po/eu.po 2014-10-14 15:21:32 +0000 |
2107 | @@ -0,0 +1,4 @@ |
2108 | +msgid "" |
2109 | +msgstr "" |
2110 | +"MIME-Version: 1.0\n" |
2111 | +"Content-Type: text/plain; charset=UTF-8\n" |
2112 | |
2113 | === added file 'po/fa.po' |
2114 | --- po/fa.po 1970-01-01 00:00:00 +0000 |
2115 | +++ po/fa.po 2014-10-14 15:21:32 +0000 |
2116 | @@ -0,0 +1,4 @@ |
2117 | +msgid "" |
2118 | +msgstr "" |
2119 | +"MIME-Version: 1.0\n" |
2120 | +"Content-Type: text/plain; charset=UTF-8\n" |
2121 | |
2122 | === added file 'po/fi.po' |
2123 | --- po/fi.po 1970-01-01 00:00:00 +0000 |
2124 | +++ po/fi.po 2014-10-14 15:21:32 +0000 |
2125 | @@ -0,0 +1,4 @@ |
2126 | +msgid "" |
2127 | +msgstr "" |
2128 | +"MIME-Version: 1.0\n" |
2129 | +"Content-Type: text/plain; charset=UTF-8\n" |
2130 | |
2131 | === added file 'po/fr.po' |
2132 | --- po/fr.po 1970-01-01 00:00:00 +0000 |
2133 | +++ po/fr.po 2014-10-14 15:21:32 +0000 |
2134 | @@ -0,0 +1,4 @@ |
2135 | +msgid "" |
2136 | +msgstr "" |
2137 | +"MIME-Version: 1.0\n" |
2138 | +"Content-Type: text/plain; charset=UTF-8\n" |
2139 | |
2140 | === added file 'po/fr_CA.po' |
2141 | --- po/fr_CA.po 1970-01-01 00:00:00 +0000 |
2142 | +++ po/fr_CA.po 2014-10-14 15:21:32 +0000 |
2143 | @@ -0,0 +1,4 @@ |
2144 | +msgid "" |
2145 | +msgstr "" |
2146 | +"MIME-Version: 1.0\n" |
2147 | +"Content-Type: text/plain; charset=UTF-8\n" |
2148 | |
2149 | === added file 'po/gl.po' |
2150 | --- po/gl.po 1970-01-01 00:00:00 +0000 |
2151 | +++ po/gl.po 2014-10-14 15:21:32 +0000 |
2152 | @@ -0,0 +1,4 @@ |
2153 | +msgid "" |
2154 | +msgstr "" |
2155 | +"MIME-Version: 1.0\n" |
2156 | +"Content-Type: text/plain; charset=UTF-8\n" |
2157 | |
2158 | === added file 'po/he.po' |
2159 | --- po/he.po 1970-01-01 00:00:00 +0000 |
2160 | +++ po/he.po 2014-10-14 15:21:32 +0000 |
2161 | @@ -0,0 +1,4 @@ |
2162 | +msgid "" |
2163 | +msgstr "" |
2164 | +"MIME-Version: 1.0\n" |
2165 | +"Content-Type: text/plain; charset=UTF-8\n" |
2166 | |
2167 | === added file 'po/hi.po' |
2168 | --- po/hi.po 1970-01-01 00:00:00 +0000 |
2169 | +++ po/hi.po 2014-10-14 15:21:32 +0000 |
2170 | @@ -0,0 +1,4 @@ |
2171 | +msgid "" |
2172 | +msgstr "" |
2173 | +"MIME-Version: 1.0\n" |
2174 | +"Content-Type: text/plain; charset=UTF-8\n" |
2175 | |
2176 | === added file 'po/hr.po' |
2177 | --- po/hr.po 1970-01-01 00:00:00 +0000 |
2178 | +++ po/hr.po 2014-10-14 15:21:32 +0000 |
2179 | @@ -0,0 +1,4 @@ |
2180 | +msgid "" |
2181 | +msgstr "" |
2182 | +"MIME-Version: 1.0\n" |
2183 | +"Content-Type: text/plain; charset=UTF-8\n" |
2184 | |
2185 | === added file 'po/hu.po' |
2186 | --- po/hu.po 1970-01-01 00:00:00 +0000 |
2187 | +++ po/hu.po 2014-10-14 15:21:32 +0000 |
2188 | @@ -0,0 +1,4 @@ |
2189 | +msgid "" |
2190 | +msgstr "" |
2191 | +"MIME-Version: 1.0\n" |
2192 | +"Content-Type: text/plain; charset=UTF-8\n" |
2193 | |
2194 | === added file 'po/hy.po' |
2195 | --- po/hy.po 1970-01-01 00:00:00 +0000 |
2196 | +++ po/hy.po 2014-10-14 15:21:32 +0000 |
2197 | @@ -0,0 +1,4 @@ |
2198 | +msgid "" |
2199 | +msgstr "" |
2200 | +"MIME-Version: 1.0\n" |
2201 | +"Content-Type: text/plain; charset=UTF-8\n" |
2202 | |
2203 | === added file 'po/id.po' |
2204 | --- po/id.po 1970-01-01 00:00:00 +0000 |
2205 | +++ po/id.po 2014-10-14 15:21:32 +0000 |
2206 | @@ -0,0 +1,4 @@ |
2207 | +msgid "" |
2208 | +msgstr "" |
2209 | +"MIME-Version: 1.0\n" |
2210 | +"Content-Type: text/plain; charset=UTF-8\n" |
2211 | |
2212 | === added file 'po/it.po' |
2213 | --- po/it.po 1970-01-01 00:00:00 +0000 |
2214 | +++ po/it.po 2014-10-14 15:21:32 +0000 |
2215 | @@ -0,0 +1,4 @@ |
2216 | +msgid "" |
2217 | +msgstr "" |
2218 | +"MIME-Version: 1.0\n" |
2219 | +"Content-Type: text/plain; charset=UTF-8\n" |
2220 | |
2221 | === added file 'po/ja.po' |
2222 | --- po/ja.po 1970-01-01 00:00:00 +0000 |
2223 | +++ po/ja.po 2014-10-14 15:21:32 +0000 |
2224 | @@ -0,0 +1,4 @@ |
2225 | +msgid "" |
2226 | +msgstr "" |
2227 | +"MIME-Version: 1.0\n" |
2228 | +"Content-Type: text/plain; charset=UTF-8\n" |
2229 | |
2230 | === added file 'po/ka.po' |
2231 | --- po/ka.po 1970-01-01 00:00:00 +0000 |
2232 | +++ po/ka.po 2014-10-14 15:21:32 +0000 |
2233 | @@ -0,0 +1,4 @@ |
2234 | +msgid "" |
2235 | +msgstr "" |
2236 | +"MIME-Version: 1.0\n" |
2237 | +"Content-Type: text/plain; charset=UTF-8\n" |
2238 | |
2239 | === added file 'po/ko.po' |
2240 | --- po/ko.po 1970-01-01 00:00:00 +0000 |
2241 | +++ po/ko.po 2014-10-14 15:21:32 +0000 |
2242 | @@ -0,0 +1,4 @@ |
2243 | +msgid "" |
2244 | +msgstr "" |
2245 | +"MIME-Version: 1.0\n" |
2246 | +"Content-Type: text/plain; charset=UTF-8\n" |
2247 | |
2248 | === added file 'po/ky.po' |
2249 | --- po/ky.po 1970-01-01 00:00:00 +0000 |
2250 | +++ po/ky.po 2014-10-14 15:21:32 +0000 |
2251 | @@ -0,0 +1,4 @@ |
2252 | +msgid "" |
2253 | +msgstr "" |
2254 | +"MIME-Version: 1.0\n" |
2255 | +"Content-Type: text/plain; charset=UTF-8\n" |
2256 | |
2257 | === added file 'po/lb.po' |
2258 | --- po/lb.po 1970-01-01 00:00:00 +0000 |
2259 | +++ po/lb.po 2014-10-14 15:21:32 +0000 |
2260 | @@ -0,0 +1,4 @@ |
2261 | +msgid "" |
2262 | +msgstr "" |
2263 | +"MIME-Version: 1.0\n" |
2264 | +"Content-Type: text/plain; charset=UTF-8\n" |
2265 | |
2266 | === added file 'po/lo.po' |
2267 | --- po/lo.po 1970-01-01 00:00:00 +0000 |
2268 | +++ po/lo.po 2014-10-14 15:21:32 +0000 |
2269 | @@ -0,0 +1,4 @@ |
2270 | +msgid "" |
2271 | +msgstr "" |
2272 | +"MIME-Version: 1.0\n" |
2273 | +"Content-Type: text/plain; charset=UTF-8\n" |
2274 | |
2275 | === added file 'po/lt.po' |
2276 | --- po/lt.po 1970-01-01 00:00:00 +0000 |
2277 | +++ po/lt.po 2014-10-14 15:21:32 +0000 |
2278 | @@ -0,0 +1,4 @@ |
2279 | +msgid "" |
2280 | +msgstr "" |
2281 | +"MIME-Version: 1.0\n" |
2282 | +"Content-Type: text/plain; charset=UTF-8\n" |
2283 | |
2284 | === added file 'po/lv.po' |
2285 | --- po/lv.po 1970-01-01 00:00:00 +0000 |
2286 | +++ po/lv.po 2014-10-14 15:21:32 +0000 |
2287 | @@ -0,0 +1,4 @@ |
2288 | +msgid "" |
2289 | +msgstr "" |
2290 | +"MIME-Version: 1.0\n" |
2291 | +"Content-Type: text/plain; charset=UTF-8\n" |
2292 | |
2293 | === added file 'po/ml.po' |
2294 | --- po/ml.po 1970-01-01 00:00:00 +0000 |
2295 | +++ po/ml.po 2014-10-14 15:21:32 +0000 |
2296 | @@ -0,0 +1,4 @@ |
2297 | +msgid "" |
2298 | +msgstr "" |
2299 | +"MIME-Version: 1.0\n" |
2300 | +"Content-Type: text/plain; charset=UTF-8\n" |
2301 | |
2302 | === added file 'po/mr.po' |
2303 | --- po/mr.po 1970-01-01 00:00:00 +0000 |
2304 | +++ po/mr.po 2014-10-14 15:21:32 +0000 |
2305 | @@ -0,0 +1,4 @@ |
2306 | +msgid "" |
2307 | +msgstr "" |
2308 | +"MIME-Version: 1.0\n" |
2309 | +"Content-Type: text/plain; charset=UTF-8\n" |
2310 | |
2311 | === added file 'po/ms.po' |
2312 | --- po/ms.po 1970-01-01 00:00:00 +0000 |
2313 | +++ po/ms.po 2014-10-14 15:21:32 +0000 |
2314 | @@ -0,0 +1,4 @@ |
2315 | +msgid "" |
2316 | +msgstr "" |
2317 | +"MIME-Version: 1.0\n" |
2318 | +"Content-Type: text/plain; charset=UTF-8\n" |
2319 | |
2320 | === added file 'po/nb.po' |
2321 | --- po/nb.po 1970-01-01 00:00:00 +0000 |
2322 | +++ po/nb.po 2014-10-14 15:21:32 +0000 |
2323 | @@ -0,0 +1,4 @@ |
2324 | +msgid "" |
2325 | +msgstr "" |
2326 | +"MIME-Version: 1.0\n" |
2327 | +"Content-Type: text/plain; charset=UTF-8\n" |
2328 | |
2329 | === added file 'po/nl.po' |
2330 | --- po/nl.po 1970-01-01 00:00:00 +0000 |
2331 | +++ po/nl.po 2014-10-14 15:21:32 +0000 |
2332 | @@ -0,0 +1,4 @@ |
2333 | +msgid "" |
2334 | +msgstr "" |
2335 | +"MIME-Version: 1.0\n" |
2336 | +"Content-Type: text/plain; charset=UTF-8\n" |
2337 | |
2338 | === added file 'po/nn.po' |
2339 | --- po/nn.po 1970-01-01 00:00:00 +0000 |
2340 | +++ po/nn.po 2014-10-14 15:21:32 +0000 |
2341 | @@ -0,0 +1,4 @@ |
2342 | +msgid "" |
2343 | +msgstr "" |
2344 | +"MIME-Version: 1.0\n" |
2345 | +"Content-Type: text/plain; charset=UTF-8\n" |
2346 | |
2347 | === added file 'po/pl.po' |
2348 | --- po/pl.po 1970-01-01 00:00:00 +0000 |
2349 | +++ po/pl.po 2014-10-14 15:21:32 +0000 |
2350 | @@ -0,0 +1,4 @@ |
2351 | +msgid "" |
2352 | +msgstr "" |
2353 | +"MIME-Version: 1.0\n" |
2354 | +"Content-Type: text/plain; charset=UTF-8\n" |
2355 | |
2356 | === added file 'po/pt.po' |
2357 | --- po/pt.po 1970-01-01 00:00:00 +0000 |
2358 | +++ po/pt.po 2014-10-14 15:21:32 +0000 |
2359 | @@ -0,0 +1,4 @@ |
2360 | +msgid "" |
2361 | +msgstr "" |
2362 | +"MIME-Version: 1.0\n" |
2363 | +"Content-Type: text/plain; charset=UTF-8\n" |
2364 | |
2365 | === added file 'po/pt_BR.po' |
2366 | --- po/pt_BR.po 1970-01-01 00:00:00 +0000 |
2367 | +++ po/pt_BR.po 2014-10-14 15:21:32 +0000 |
2368 | @@ -0,0 +1,4 @@ |
2369 | +msgid "" |
2370 | +msgstr "" |
2371 | +"MIME-Version: 1.0\n" |
2372 | +"Content-Type: text/plain; charset=UTF-8\n" |
2373 | |
2374 | === added file 'po/ro.po' |
2375 | --- po/ro.po 1970-01-01 00:00:00 +0000 |
2376 | +++ po/ro.po 2014-10-14 15:21:32 +0000 |
2377 | @@ -0,0 +1,4 @@ |
2378 | +msgid "" |
2379 | +msgstr "" |
2380 | +"MIME-Version: 1.0\n" |
2381 | +"Content-Type: text/plain; charset=UTF-8\n" |
2382 | |
2383 | === added file 'po/ru.po' |
2384 | --- po/ru.po 1970-01-01 00:00:00 +0000 |
2385 | +++ po/ru.po 2014-10-14 15:21:32 +0000 |
2386 | @@ -0,0 +1,4 @@ |
2387 | +msgid "" |
2388 | +msgstr "" |
2389 | +"MIME-Version: 1.0\n" |
2390 | +"Content-Type: text/plain; charset=UTF-8\n" |
2391 | |
2392 | === added file 'po/rue.po' |
2393 | --- po/rue.po 1970-01-01 00:00:00 +0000 |
2394 | +++ po/rue.po 2014-10-14 15:21:32 +0000 |
2395 | @@ -0,0 +1,4 @@ |
2396 | +msgid "" |
2397 | +msgstr "" |
2398 | +"MIME-Version: 1.0\n" |
2399 | +"Content-Type: text/plain; charset=UTF-8\n" |
2400 | |
2401 | === added file 'po/si.po' |
2402 | --- po/si.po 1970-01-01 00:00:00 +0000 |
2403 | +++ po/si.po 2014-10-14 15:21:32 +0000 |
2404 | @@ -0,0 +1,4 @@ |
2405 | +msgid "" |
2406 | +msgstr "" |
2407 | +"MIME-Version: 1.0\n" |
2408 | +"Content-Type: text/plain; charset=UTF-8\n" |
2409 | |
2410 | === added file 'po/sk.po' |
2411 | --- po/sk.po 1970-01-01 00:00:00 +0000 |
2412 | +++ po/sk.po 2014-10-14 15:21:32 +0000 |
2413 | @@ -0,0 +1,4 @@ |
2414 | +msgid "" |
2415 | +msgstr "" |
2416 | +"MIME-Version: 1.0\n" |
2417 | +"Content-Type: text/plain; charset=UTF-8\n" |
2418 | |
2419 | === added file 'po/sl.po' |
2420 | --- po/sl.po 1970-01-01 00:00:00 +0000 |
2421 | +++ po/sl.po 2014-10-14 15:21:32 +0000 |
2422 | @@ -0,0 +1,4 @@ |
2423 | +msgid "" |
2424 | +msgstr "" |
2425 | +"MIME-Version: 1.0\n" |
2426 | +"Content-Type: text/plain; charset=UTF-8\n" |
2427 | |
2428 | === added file 'po/sma.po' |
2429 | --- po/sma.po 1970-01-01 00:00:00 +0000 |
2430 | +++ po/sma.po 2014-10-14 15:21:32 +0000 |
2431 | @@ -0,0 +1,4 @@ |
2432 | +msgid "" |
2433 | +msgstr "" |
2434 | +"MIME-Version: 1.0\n" |
2435 | +"Content-Type: text/plain; charset=UTF-8\n" |
2436 | |
2437 | === added file 'po/sq.po' |
2438 | --- po/sq.po 1970-01-01 00:00:00 +0000 |
2439 | +++ po/sq.po 2014-10-14 15:21:32 +0000 |
2440 | @@ -0,0 +1,4 @@ |
2441 | +msgid "" |
2442 | +msgstr "" |
2443 | +"MIME-Version: 1.0\n" |
2444 | +"Content-Type: text/plain; charset=UTF-8\n" |
2445 | |
2446 | === added file 'po/sr.po' |
2447 | --- po/sr.po 1970-01-01 00:00:00 +0000 |
2448 | +++ po/sr.po 2014-10-14 15:21:32 +0000 |
2449 | @@ -0,0 +1,4 @@ |
2450 | +msgid "" |
2451 | +msgstr "" |
2452 | +"MIME-Version: 1.0\n" |
2453 | +"Content-Type: text/plain; charset=UTF-8\n" |
2454 | |
2455 | === added file 'po/sv.po' |
2456 | --- po/sv.po 1970-01-01 00:00:00 +0000 |
2457 | +++ po/sv.po 2014-10-14 15:21:32 +0000 |
2458 | @@ -0,0 +1,4 @@ |
2459 | +msgid "" |
2460 | +msgstr "" |
2461 | +"MIME-Version: 1.0\n" |
2462 | +"Content-Type: text/plain; charset=UTF-8\n" |
2463 | |
2464 | === added file 'po/sw.po' |
2465 | --- po/sw.po 1970-01-01 00:00:00 +0000 |
2466 | +++ po/sw.po 2014-10-14 15:21:32 +0000 |
2467 | @@ -0,0 +1,4 @@ |
2468 | +msgid "" |
2469 | +msgstr "" |
2470 | +"MIME-Version: 1.0\n" |
2471 | +"Content-Type: text/plain; charset=UTF-8\n" |
2472 | |
2473 | === added file 'po/ta.po' |
2474 | --- po/ta.po 1970-01-01 00:00:00 +0000 |
2475 | +++ po/ta.po 2014-10-14 15:21:32 +0000 |
2476 | @@ -0,0 +1,4 @@ |
2477 | +msgid "" |
2478 | +msgstr "" |
2479 | +"MIME-Version: 1.0\n" |
2480 | +"Content-Type: text/plain; charset=UTF-8\n" |
2481 | |
2482 | === added file 'po/te.po' |
2483 | --- po/te.po 1970-01-01 00:00:00 +0000 |
2484 | +++ po/te.po 2014-10-14 15:21:32 +0000 |
2485 | @@ -0,0 +1,4 @@ |
2486 | +msgid "" |
2487 | +msgstr "" |
2488 | +"MIME-Version: 1.0\n" |
2489 | +"Content-Type: text/plain; charset=UTF-8\n" |
2490 | |
2491 | === added file 'po/th.po' |
2492 | --- po/th.po 1970-01-01 00:00:00 +0000 |
2493 | +++ po/th.po 2014-10-14 15:21:32 +0000 |
2494 | @@ -0,0 +1,4 @@ |
2495 | +msgid "" |
2496 | +msgstr "" |
2497 | +"MIME-Version: 1.0\n" |
2498 | +"Content-Type: text/plain; charset=UTF-8\n" |
2499 | |
2500 | === added file 'po/tr.po' |
2501 | --- po/tr.po 1970-01-01 00:00:00 +0000 |
2502 | +++ po/tr.po 2014-10-14 15:21:32 +0000 |
2503 | @@ -0,0 +1,4 @@ |
2504 | +msgid "" |
2505 | +msgstr "" |
2506 | +"MIME-Version: 1.0\n" |
2507 | +"Content-Type: text/plain; charset=UTF-8\n" |
2508 | |
2509 | === added file 'po/uk.po' |
2510 | --- po/uk.po 1970-01-01 00:00:00 +0000 |
2511 | +++ po/uk.po 2014-10-14 15:21:32 +0000 |
2512 | @@ -0,0 +1,4 @@ |
2513 | +msgid "" |
2514 | +msgstr "" |
2515 | +"MIME-Version: 1.0\n" |
2516 | +"Content-Type: text/plain; charset=UTF-8\n" |
2517 | |
2518 | === added file 'po/vi.po' |
2519 | --- po/vi.po 1970-01-01 00:00:00 +0000 |
2520 | +++ po/vi.po 2014-10-14 15:21:32 +0000 |
2521 | @@ -0,0 +1,4 @@ |
2522 | +msgid "" |
2523 | +msgstr "" |
2524 | +"MIME-Version: 1.0\n" |
2525 | +"Content-Type: text/plain; charset=UTF-8\n" |
2526 | |
2527 | === added file 'po/zh_CN.po' |
2528 | --- po/zh_CN.po 1970-01-01 00:00:00 +0000 |
2529 | +++ po/zh_CN.po 2014-10-14 15:21:32 +0000 |
2530 | @@ -0,0 +1,4 @@ |
2531 | +msgid "" |
2532 | +msgstr "" |
2533 | +"MIME-Version: 1.0\n" |
2534 | +"Content-Type: text/plain; charset=UTF-8\n" |
2535 | |
2536 | === added file 'po/zh_HK.po' |
2537 | --- po/zh_HK.po 1970-01-01 00:00:00 +0000 |
2538 | +++ po/zh_HK.po 2014-10-14 15:21:32 +0000 |
2539 | @@ -0,0 +1,4 @@ |
2540 | +msgid "" |
2541 | +msgstr "" |
2542 | +"MIME-Version: 1.0\n" |
2543 | +"Content-Type: text/plain; charset=UTF-8\n" |
2544 | |
2545 | === added file 'po/zh_TW.po' |
2546 | --- po/zh_TW.po 1970-01-01 00:00:00 +0000 |
2547 | +++ po/zh_TW.po 2014-10-14 15:21:32 +0000 |
2548 | @@ -0,0 +1,4 @@ |
2549 | +msgid "" |
2550 | +msgstr "" |
2551 | +"MIME-Version: 1.0\n" |
2552 | +"Content-Type: text/plain; charset=UTF-8\n" |
2553 | |
2554 | === modified file 'src/CMakeLists.txt' |
2555 | --- src/CMakeLists.txt 2014-10-14 07:55:31 +0000 |
2556 | +++ src/CMakeLists.txt 2014-10-14 15:21:32 +0000 |
2557 | @@ -25,7 +25,7 @@ |
2558 | add_definitions (${DEPS_CFLAGS} ${LIBSOURCE_CFLAGS} ${GCONF_CFLAGS} ${NOTIFY_CFLAGS}) |
2559 | link_libraries (${DEPS_LIBRARIES} ${LIBSOURCE_LIBRARIES} ${GCONF_LIBRARIES} ${GTHREAD_LIBRARIES} ${NOTIFY_LIBRARIES}) |
2560 | link_directories (${DEPS_LIBRARY_DIRS} ${LIBSOURCE_LIBRARY_DIRS} ${GCONF_LIBRARY_DIRS}) |
2561 | -vala_precompile(VALA_C |
2562 | +vala_precompile(VALA_C ../arrive |
2563 | Arrive.vala |
2564 | config.vala |
2565 | Utils.vala |
2566 | @@ -57,7 +57,7 @@ |
2567 | -g |
2568 | ) |
2569 | |
2570 | -add_executable (arrive ${VALA_C}) |
2571 | -target_link_libraries (arrive ${NORMAL_LIBRARIES}) |
2572 | +add_executable (../arrive ${VALA_C}) |
2573 | +target_link_libraries (../arrive ${NORMAL_LIBRARIES}) |
2574 | |
2575 | -install(TARGETS arrive RUNTIME DESTINATION bin) |
2576 | +install(TARGETS ../arrive RUNTIME DESTINATION bin) |
2577 | |
2578 | === removed file 'src/config.vala' |
2579 | --- src/config.vala 2014-10-14 08:14:12 +0000 |
2580 | +++ src/config.vala 1970-01-01 00:00:00 +0000 |
2581 | @@ -1,11 +0,0 @@ |
2582 | -namespace Build { |
2583 | - public const string DATADIR = "/usr/share"; |
2584 | - public const string PKG_DATADIR = ""; |
2585 | - public const string PLUGIN_DIR = ""; |
2586 | - public const string GETTEXT_PACKAGE = "arrive"; |
2587 | - public const string RELEASE_NAME = "Download Manager"; |
2588 | - public const string VERSION = "0.2"; |
2589 | - public const string VERSION_INFO = "Release"; |
2590 | - public const string CMAKE_INSTALL_PREFIX = "/usr"; |
2591 | - public const string ICON_DIR = ""; |
2592 | -} |