Mercurial Mercurial > mcabber-isbear-patches / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[cmake] Fix ESCDELAY detection default tip
authorMyhailo Danylenko <isbear@isbear.org.ua>
Fri, 09 Dec 2016 03:14:57 +0200
changeset 93 d59df8a9413d
parent 92 66f7e2aa040c
[cmake] Fix ESCDELAY detection
add-cmake.diff file | annotate | diff | comparison | revisions
series file | annotate | diff | comparison | revisions 
--- a/add-cmake.diff	Fri Dec 09 02:12:34 2016 +0200
+++ b/add-cmake.diff	Fri Dec 09 03:14:57 2016 +0200
@@ -1,6 +1,6 @@
 # HG changeset patch
 # Parent 386f3b8646a61ba6af61609ff67f2da2cc70251e
-# Parent  04c97ffb0b5a75641bb2e6c1fc762f0383bc265e
+# Parent  926a4c065b3a767aa58b37a952327954e3bad98a
 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,308 @@
+@@ -0,0 +1,309 @@
 +## Copyright 2010-2012 Myhailo Danylenko
 +# This file is part of mcabber.
 +#
@@ -118,9 +118,10 @@
 +		# XXX just fail?
 +	endif ()
 +endif ()
-+set ( CMAKE_REQUIRED_INCLUDES  ${CURSES_INCLUDE_DIRS}               )
-+set ( CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARIES}                  )
-+set ( CMAKE_REQUIRED_FLAGS     "${CURSES_LDFLAGS} ${CURSES_CFLAGS}" )
++set ( CMAKE_REQUIRED_INCLUDES    ${CURSES_INCLUDE_DIRS} )
++set ( CMAKE_REQUIRED_LIBRARIES   ${CURSES_LIBRARIES}    )
++set ( CMAKE_REQUIRED_DEFINITIONS ${CURSES_CFLAGS_OTHER} )
++set ( CMAKE_REQUIRED_FLAGS       ${CURSES_LDFLAGS}      )
 +check_symbol_exists ( ESCDELAY "curses.h" HAVE_ESCDELAY )
 +
 +# Gpgme
--- a/series	Fri Dec 09 02:12:34 2016 +0200
+++ b/series	Fri Dec 09 03:14:57 2016 +0200
@@ -1,10 +1,10 @@
 fix-compile-warning-xmpp_c.diff
 switch-to-experimental.diff
+add-cmake.diff
 separate-extcmd.diff
 modularize-extcmd.diff
 add-offline-message.diff
 roster-state-colors.diff
-add-cmake.diff
 use-gslice.diff
 fix-date-fill.diff
 timeformat.diff
mcabber-isbear-patches