/[gentoo-x86]/dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch
Gentoo

Contents of /dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Tue May 6 21:12:34 2014 UTC (6 months, 3 weeks ago) by johu
Branch: MAIN
CVS Tags: HEAD
Add patch to fix build with sys-libs/ncurses[tinfo] by Mark Wright <gienah@gentoo.org>, bug #468622.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

1 --- cmake-2.8.12.1-orig/Modules/FindCurses.cmake 2013-11-06 06:07:22.000000000 +1100
2 +++ cmake-2.8.12.1/Modules/FindCurses.cmake 2014-01-17 21:55:40.630142386 +1100
3 @@ -30,7 +30,7 @@
4 find_library(CURSES_NCURSES_LIBRARY NAMES ncurses )
5 set(CURSES_USE_NCURSES FALSE)
6
7 -if(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_LIBRARY)
8 +if(CURSES_NCURSES_LIBRARY AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES))
9 set(CURSES_USE_NCURSES TRUE)
10 endif()
11 # http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html
12 @@ -125,10 +125,20 @@
13 CACHE FILEPATH "The curses library" ${FORCE_IT})
14 endif()
15
16 + CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}"
17 + cbreak "" CURSES_NCURSES_HAS_CBREAK)
18 + if(NOT CURSES_NCURSES_HAS_CBREAK)
19 + find_library(CURSES_EXTRA_LIBRARY tinfo HINTS "${_cursesLibDir}")
20 + find_library(CURSES_EXTRA_LIBRARY tinfo )
21 + CHECK_LIBRARY_EXISTS("${CURSES_EXTRA_LIBRARY}"
22 + cbreak "" CURSES_TINFO_HAS_CBREAK)
23 + endif()
24 endif()
25
26 -find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
27 -find_library(CURSES_EXTRA_LIBRARY cur_colr )
28 +if (NOT CURSES_TINFO_HAS_CBREAK)
29 + find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
30 + find_library(CURSES_EXTRA_LIBRARY cur_colr )
31 +endif()
32
33 find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}")
34 find_library(CURSES_FORM_LIBRARY form )
35 @@ -172,5 +182,7 @@
36 CURSES_INCLUDE_DIR
37 CURSES_CURSES_HAS_WSYNCUP
38 CURSES_NCURSES_HAS_WSYNCUP
39 + CURSES_NCURSES_HAS_CBREAK
40 + CURSES_TINFO_HAS_CBREAK
41 )
42

  ViewVC Help
Powered by ViewVC 1.1.20