Fixes to cmake (sha256 and version)
authorMyhailo Danylenko <isbear@ukrpost.net>
Fri, 04 Mar 2016 15:57:04 +0200
changeset 91 51d326d5cb92
parent 90 bed5beae28c5
child 92 66f7e2aa040c
Fixes to cmake (sha256 and version)
add-cmake.diff
--- a/add-cmake.diff	Fri Mar 04 14:17:38 2016 +0200
+++ b/add-cmake.diff	Fri Mar 04 15:57:04 2016 +0200
@@ -1,6 +1,6 @@
 # HG changeset patch
 # Parent 386f3b8646a61ba6af61609ff67f2da2cc70251e
-# Parent  1fc7abfb98a95efb5e16cf412ec11182baa6f5bd
+# Parent  3ac5a22405458457d067b59e4e31cb1cda415f13
 Add possibility to build with CMake
 
 diff --git a/.hgignore b/.hgignore
@@ -16,7 +16,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/mcabber/CMakeLists.txt
-@@ -0,0 +1,303 @@
+@@ -0,0 +1,308 @@
 +## Copyright 2010-2012 Myhailo Danylenko
 +# This file is part of mcabber.
 +#
@@ -35,7 +35,7 @@
 +
 +cmake_minimum_required ( VERSION 2.6 )
 +project ( mcabber C )
-+set ( PROJECT_VERSION "1.0.1-dev" )
++set ( PROJECT_VERSION "1.0.3-dev" )
 +
 +## User settable options
 +option ( ENABLE_DEBUG    "Enable debugging output"                       OFF ) # XXX is it really used?
@@ -82,7 +82,12 @@
 +endif ()
 +
 +# Loudmouth
-+pkg_check_modules ( LM REQUIRED loudmouth-1.0>=1.4.2 )
++pkg_check_modules ( LM loudmouth-1.0>=1.5.3 )
++if ( LM_FOUND )
++	set ( LOUDMOUTH_USES_SHA256 TRUE )
++else ()
++	pkg_check_modules ( LM REQUIRED loudmouth-1.0>=1.4.2 )
++endif ()
 +set ( CMAKE_REQUIRED_INCLUDES  ${LM_INCLUDE_DIRS}         )
 +set ( CMAKE_REQUIRED_LIBRARIES ${LM_LIBRARIES}            )
 +set ( CMAKE_REQUIRED_FLAGS     ${LM_LDFLAGS} ${LM_CFLAGS} )
@@ -324,7 +329,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/mcabber/config.h.in
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,54 @@
 +/* help @help.c */
 +#define DATA_DIR                      "@DATA_DIR@"
 +/* conditional @main.c */ /* does it have any effect really? */
@@ -333,6 +338,7 @@
 +#cmakedefine ENABLE_HGCSET            @ENABLE_HGCSET@
 +/* @xmpp.c */
 +#cmakedefine HAVE_ARC4RANDOM          @HAVE_ARC4RANDOM@
++#cmakedefine LOUDMOUTH_USES_SHA256    @LOUDMOUTH_USES_SHA256@ 
 +#cmakedefine HAVE_LM_SSL_CIPHER_LIST  @HAVE_LM_SSL_CIPHER_LIST@
 +#cmakedefine HAVE_LM_SSL_CA           @HAVE_LM_SSL_CA@
 +/* @screen.c */