equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 386f3b8646a61ba6af61609ff67f2da2cc70251e |
2 # Parent 386f3b8646a61ba6af61609ff67f2da2cc70251e |
3 # Parent 1fc7abfb98a95efb5e16cf412ec11182baa6f5bd |
3 # Parent 3ac5a22405458457d067b59e4e31cb1cda415f13 |
4 Add possibility to build with CMake |
4 Add possibility to build with CMake |
5 |
5 |
6 diff --git a/.hgignore b/.hgignore |
6 diff --git a/.hgignore b/.hgignore |
7 --- a/.hgignore |
7 --- a/.hgignore |
8 +++ b/.hgignore |
8 +++ b/.hgignore |
14 +mcabber/build |
14 +mcabber/build |
15 diff --git a/mcabber/CMakeLists.txt b/mcabber/CMakeLists.txt |
15 diff --git a/mcabber/CMakeLists.txt b/mcabber/CMakeLists.txt |
16 new file mode 100644 |
16 new file mode 100644 |
17 --- /dev/null |
17 --- /dev/null |
18 +++ b/mcabber/CMakeLists.txt |
18 +++ b/mcabber/CMakeLists.txt |
19 @@ -0,0 +1,303 @@ |
19 @@ -0,0 +1,308 @@ |
20 +## Copyright 2010-2012 Myhailo Danylenko |
20 +## Copyright 2010-2012 Myhailo Danylenko |
21 +# This file is part of mcabber. |
21 +# This file is part of mcabber. |
22 +# |
22 +# |
23 +# mcabber is free software: you can redistribute it and/or modify |
23 +# mcabber is free software: you can redistribute it and/or modify |
24 +# it under the terms of the GNU General Public License as published by |
24 +# it under the terms of the GNU General Public License as published by |
33 +# You should have received a copy of the GNU General Public License |
33 +# You should have received a copy of the GNU General Public License |
34 +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
34 +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
35 + |
35 + |
36 +cmake_minimum_required ( VERSION 2.6 ) |
36 +cmake_minimum_required ( VERSION 2.6 ) |
37 +project ( mcabber C ) |
37 +project ( mcabber C ) |
38 +set ( PROJECT_VERSION "1.0.1-dev" ) |
38 +set ( PROJECT_VERSION "1.0.3-dev" ) |
39 + |
39 + |
40 +## User settable options |
40 +## User settable options |
41 +option ( ENABLE_DEBUG "Enable debugging output" OFF ) # XXX is it really used? |
41 +option ( ENABLE_DEBUG "Enable debugging output" OFF ) # XXX is it really used? |
42 +option ( USE_SIGWINCH "Compile with SIGWINCH handler" OFF ) |
42 +option ( USE_SIGWINCH "Compile with SIGWINCH handler" OFF ) |
43 +option ( MODULES_ENABLE "Enable dynamic module loading" ON ) |
43 +option ( MODULES_ENABLE "Enable dynamic module loading" ON ) |
80 +if ( MODULES_ENABLE ) |
80 +if ( MODULES_ENABLE ) |
81 + pkg_check_modules ( GMODULE REQUIRED gmodule-2.0 ) |
81 + pkg_check_modules ( GMODULE REQUIRED gmodule-2.0 ) |
82 +endif () |
82 +endif () |
83 + |
83 + |
84 +# Loudmouth |
84 +# Loudmouth |
85 +pkg_check_modules ( LM REQUIRED loudmouth-1.0>=1.4.2 ) |
85 +pkg_check_modules ( LM loudmouth-1.0>=1.5.3 ) |
|
86 +if ( LM_FOUND ) |
|
87 + set ( LOUDMOUTH_USES_SHA256 TRUE ) |
|
88 +else () |
|
89 + pkg_check_modules ( LM REQUIRED loudmouth-1.0>=1.4.2 ) |
|
90 +endif () |
86 +set ( CMAKE_REQUIRED_INCLUDES ${LM_INCLUDE_DIRS} ) |
91 +set ( CMAKE_REQUIRED_INCLUDES ${LM_INCLUDE_DIRS} ) |
87 +set ( CMAKE_REQUIRED_LIBRARIES ${LM_LIBRARIES} ) |
92 +set ( CMAKE_REQUIRED_LIBRARIES ${LM_LIBRARIES} ) |
88 +set ( CMAKE_REQUIRED_FLAGS ${LM_LDFLAGS} ${LM_CFLAGS} ) |
93 +set ( CMAKE_REQUIRED_FLAGS ${LM_LDFLAGS} ${LM_CFLAGS} ) |
89 +check_symbol_exists ( lm_connection_unregister_reply_handler "loudmouth/loudmouth.h" HAVE_LM_CONNECTION_UNREGISTER_REPLY_HANDLER ) |
94 +check_symbol_exists ( lm_connection_unregister_reply_handler "loudmouth/loudmouth.h" HAVE_LM_CONNECTION_UNREGISTER_REPLY_HANDLER ) |
90 +check_symbol_exists ( lm_ssl_set_cipher_list "loudmouth/loudmouth.h" HAVE_LM_SSL_CIPHER_LIST ) |
95 +check_symbol_exists ( lm_ssl_set_cipher_list "loudmouth/loudmouth.h" HAVE_LM_SSL_CIPHER_LIST ) |
322 +## The End ## vim: se ts=4 sw=4: ## |
327 +## The End ## vim: se ts=4 sw=4: ## |
323 diff --git a/mcabber/config.h.in b/mcabber/config.h.in |
328 diff --git a/mcabber/config.h.in b/mcabber/config.h.in |
324 new file mode 100644 |
329 new file mode 100644 |
325 --- /dev/null |
330 --- /dev/null |
326 +++ b/mcabber/config.h.in |
331 +++ b/mcabber/config.h.in |
327 @@ -0,0 +1,53 @@ |
332 @@ -0,0 +1,54 @@ |
328 +/* help @help.c */ |
333 +/* help @help.c */ |
329 +#define DATA_DIR "@DATA_DIR@" |
334 +#define DATA_DIR "@DATA_DIR@" |
330 +/* conditional @main.c */ /* does it have any effect really? */ |
335 +/* conditional @main.c */ /* does it have any effect really? */ |
331 +#cmakedefine ENABLE_DEBUG @ENABLE_DEBUG@ |
336 +#cmakedefine ENABLE_DEBUG @ENABLE_DEBUG@ |
332 +/* conditional @main.c */ |
337 +/* conditional @main.c */ |
333 +#cmakedefine ENABLE_HGCSET @ENABLE_HGCSET@ |
338 +#cmakedefine ENABLE_HGCSET @ENABLE_HGCSET@ |
334 +/* @xmpp.c */ |
339 +/* @xmpp.c */ |
335 +#cmakedefine HAVE_ARC4RANDOM @HAVE_ARC4RANDOM@ |
340 +#cmakedefine HAVE_ARC4RANDOM @HAVE_ARC4RANDOM@ |
|
341 +#cmakedefine LOUDMOUTH_USES_SHA256 @LOUDMOUTH_USES_SHA256@ |
336 +#cmakedefine HAVE_LM_SSL_CIPHER_LIST @HAVE_LM_SSL_CIPHER_LIST@ |
342 +#cmakedefine HAVE_LM_SSL_CIPHER_LIST @HAVE_LM_SSL_CIPHER_LIST@ |
337 +#cmakedefine HAVE_LM_SSL_CA @HAVE_LM_SSL_CA@ |
343 +#cmakedefine HAVE_LM_SSL_CA @HAVE_LM_SSL_CA@ |
338 +/* @screen.c */ |
344 +/* @screen.c */ |
339 +#cmakedefine HAVE_ESCDELAY @HAVE_ESCDELAY@ |
345 +#cmakedefine HAVE_ESCDELAY @HAVE_ESCDELAY@ |
340 +/* alot */ |
346 +/* alot */ |