--- a/add-cmake Wed Jul 18 15:08:21 2012 +0300
+++ b/add-cmake Thu Jul 19 10:07:43 2012 +0300
@@ -1,20 +1,20 @@
# HG changeset patch
-# Parent 7d80a74d69a007cd16c36664ca64924598394020
+# Parent e2ba0b74584c4965e2a42466b6c7da4d85e47548
[in development] Add possibility to build with CMake
-diff -r 7d80a74d69a0 .hgignore
---- a/.hgignore Wed Jul 18 13:45:49 2012 +0300
-+++ b/.hgignore Wed Jul 18 15:07:47 2012 +0300
+diff -r e2ba0b74584c .hgignore
+--- a/.hgignore Thu Jul 19 08:06:20 2012 +0300
++++ b/.hgignore Thu Jul 19 10:06:52 2012 +0300
@@ -34,3 +34,5 @@
tags
mcabber/ptodo
mcabber/ppatches
+
+mcabber/build
-diff -r 7d80a74d69a0 mcabber/CMakeLists.txt
+diff -r e2ba0b74584c mcabber/CMakeLists.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/CMakeLists.txt Wed Jul 18 15:07:47 2012 +0300
-@@ -0,0 +1,277 @@
++++ b/mcabber/CMakeLists.txt Thu Jul 19 10:06:52 2012 +0300
+@@ -0,0 +1,290 @@
+## Copyright 2010-2012 Myhailo Danylenko
+# This file is part of mcabber.
+#
@@ -221,6 +221,12 @@
+ ${PANEL_LIBRARIES}
+ ${GPGME_LIBRARIES}
+ ${LIBOTR_LIBRARIES} )
++target_link_libraries ( fifo
++ ${GLIB_LIBRARIES} )
++target_link_libraries ( eventcmd
++ ${GLIB_LIBRARIES} )
++target_link_libraries ( xttitle
++ ${GLIB_LIBRARIES} )
+include_directories ( ${mcabber_SOURCE_DIR}
+ ${mcabber_BINARY_DIR}/include
+ ${mcabber_BINARY_DIR}/include/mcabber )
@@ -273,28 +279,35 @@
+set(CPACK_SOURCE_IGNORE_FILES "/\\\\..*;\\\\.swp;~$;/build/;\\\\.tar\\\\.;\\\\.deb;\\\\.so")
+include(CPack)
+
++## Pkg-config stuff
++# build time variables (cflags)
++configure_file ( mcabber.pc.in.in mcabber.pc.in @ONLY )
++# install time variables (paths)
++install ( CODE "configure_file ( ${mcabber_BINARY_DIR}/mcabber.pc.in ${mcabber_BINARY_DIR}/mcabber.pc )" )
++
+## Set up installer
+install ( TARGETS mcabber DESTINATION bin )
+if ( MODULES_ENABLE )
+ install ( DIRECTORY mcabber/ ${mcabber_BINARY_DIR}/include/mcabber/ DESTINATION include/mcabber FILES_MATCHING PATTERN "*.h" PATTERN ".*" EXCLUDE )
-+ install ( TARGETS beep eventcmd fifo urlregex xttitle DESTINATION lib/mcabber )
-+ install ( FILES mcabber.pc DESTINATION lib/pkgconfig )
++ install ( TARGETS beep eventcmd fifo urlregex xttitle DESTINATION lib/mcabber )
++ install ( FILES ${mcabber_BINARY_DIR}/mcabber.pc DESTINATION lib/pkgconfig )
+endif ()
+install ( DIRECTORY doc/help DESTINATION share/mcabber FILES_MATCHING PATTERN "*.txt" )
++install ( FILES doc/mcabber.1 DESTINATION share/man/man1 )
+install ( FILES mcabberrc.example DESTINATION share/doc/${CPACK_PACKAGE_NAME}/examples )
++install ( FILES ChangeLog DESTINATION share/doc/${CPACK_PACKAGE_NAME} RENAME changelog )
++install ( FILES COPYING DESTINATION share/doc/${CPACK_PACKAGE_NAME} RENAME copyright )
+install ( FILES AUTHORS README TODO ChangeLog.api doc/HOWTO_modules.txt doc/README_PGP.txt DESTINATION share/doc/${CPACK_PACKAGE_NAME} )
++install ( DIRECTORY contrib DESTINATION share/doc/${CPACK_PACKAGE_NAME} )
+install ( FILES doc/mcabber.1.html doc/manpage.css DESTINATION share/doc/${CPACK_PACKAGE_NAME}/html )
+if ( HAVE_LATEX )
+ install ( FILES ${mcabber_BINARY_DIR}/guide.pdf DESTINATION share/doc/${CPACK_PACKAGE_NAME} ) # :/
+endif ()
-+install ( FILES ChangeLog DESTINATION share/doc/${CPACK_PACKAGE_NAME} RENAME changelog )
-+install ( FILES COPYING DESTINATION share/doc/${CPACK_PACKAGE_NAME} RENAME copyright )
-+install ( FILES doc/mcabber.1 DESTINATION share/man/man1 )
+
+## The End ## vim: se ts=4 sw=4: ##
-diff -r 7d80a74d69a0 mcabber/config.h.in
+diff -r e2ba0b74584c mcabber/config.h.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/config.h.in Wed Jul 18 15:07:47 2012 +0300
++++ b/mcabber/config.h.in Thu Jul 19 10:06:52 2012 +0300
@@ -0,0 +1,49 @@
+/* help @help.c */
+#define DATA_DIR "@DATA_DIR@"
@@ -345,9 +358,9 @@
+/* option, also XEP0085? */
+#cmakedefine XEP0022 @XEP0022@
+/* end */
-diff -r 7d80a74d69a0 mcabber/configure.ac
---- a/mcabber/configure.ac Wed Jul 18 13:45:49 2012 +0300
-+++ b/mcabber/configure.ac Wed Jul 18 15:07:47 2012 +0300
+diff -r e2ba0b74584c mcabber/configure.ac
+--- a/mcabber/configure.ac Thu Jul 19 08:06:20 2012 +0300
++++ b/mcabber/configure.ac Thu Jul 19 10:06:52 2012 +0300
@@ -36,9 +36,8 @@
# Checks for header files.
@@ -373,10 +386,28 @@
AC_CHECK_DECLS([strptime],,,
-diff -r 7d80a74d69a0 mcabber/hgcset.h.in
+diff -r e2ba0b74584c mcabber/hgcset.h.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/hgcset.h.in Wed Jul 18 15:07:47 2012 +0300
++++ b/mcabber/hgcset.h.in Thu Jul 19 10:06:52 2012 +0300
@@ -0,0 +1,3 @@
+/* this can go to config.h */
+#define HGCSET "@HGCSET@"
+/* end */
+diff -r e2ba0b74584c mcabber/mcabber.pc.in.in
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/mcabber/mcabber.pc.in.in Thu Jul 19 10:06:52 2012 +0300
+@@ -0,0 +1,14 @@
++prefix=${CMAKE_INSTALL_PREFIX}
++exec_prefix=$${EMPTY}{prefix}
++libdir=$${EMPTY}{prefix}/lib
++includedir=$${EMPTY}{prefix}/include
++datadir=@DATA_DIR@
++pkglibdir=@PKGLIB_DIR@
++
++Name: MCabber
++Description: Modular XMPP client
++URL: http://mcabber.com
++Requires.private: glib-2.0 gmodule-2.0 loudmouth-1.0
++Version: @PROJECT_VERSION@
++Libs:
++Cflags: -I$${EMPTY}{includedir} @LIBOTR_CFLAGS@ @GPGME_CFLAGS@