[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2821-g4c1560c

[Rolf Eike Beer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4c1560ce1caab2bab72a0fca7ef73177b45327d3 (commit)
       via  773286e0141720712d514ff18365c49e69c93087 (commit)
      from  363019733c2dc5bcf84328d70822ca8e4d62409d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c1560ce1caab2bab72a0fca7ef73177b45327d3
commit 4c1560ce1caab2bab72a0fca7ef73177b45327d3
Merge: 3630197 773286e
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue May 6 15:06:41 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 6 15:06:41 2014 -0400

    Merge topic 'ncurses-tinfo' into next
    
    773286e0 FindCurses: fix cbreak not being found when ncurses is linked against terminfo


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=773286e0141720712d514ff18365c49e69c93087
commit 773286e0141720712d514ff18365c49e69c93087
Author:     Mark Wright <gienah at gentoo.org>
AuthorDate: Fri Jan 17 11:34:58 2014 +0000
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue May 6 20:57:40 2014 +0200

    FindCurses: fix cbreak not being found when ncurses is linked against terminfo
    
    ld: CMakeFiles/ccmake.dir/CursesDialog/ccmake.cxx.o: undefined reference to symbol 'cbreak'
    ld: note: 'cbreak' is defined in DSO /lib/libtinfo.so.5 so try adding it to the linker command line
    
    See https://bugs.gentoo.org/show_bug.cgi?id=468622 for more information.

diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake
index fa420c1..9b633c7 100644
--- a/Modules/FindCurses.cmake
+++ b/Modules/FindCurses.cmake
@@ -40,7 +40,7 @@ find_library(CURSES_CURSES_LIBRARY NAMES curses )
 find_library(CURSES_NCURSES_LIBRARY NAMES ncurses )
 set(CURSES_USE_NCURSES FALSE)
 
-if(CURSES_NCURSES_LIBRARY  AND NOT  CURSES_CURSES_LIBRARY)
+if(CURSES_NCURSES_LIBRARY  AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES))
   set(CURSES_USE_NCURSES TRUE)
 endif()
 # http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html
@@ -139,10 +139,20 @@ else()
       CACHE FILEPATH "The curses library" ${FORCE_IT})
   endif()
 
+  CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}"
+    cbreak "" CURSES_NCURSES_HAS_CBREAK)
+  if(NOT CURSES_NCURSES_HAS_CBREAK)
+    find_library(CURSES_EXTRA_LIBRARY tinfo HINTS "${_cursesLibDir}")
+    find_library(CURSES_EXTRA_LIBRARY tinfo )
+    CHECK_LIBRARY_EXISTS("${CURSES_EXTRA_LIBRARY}"
+      cbreak "" CURSES_TINFO_HAS_CBREAK)
+  endif()
 endif()
 
-find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
-find_library(CURSES_EXTRA_LIBRARY cur_colr )
+if (NOT CURSES_TINFO_HAS_CBREAK)
+  find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
+  find_library(CURSES_EXTRA_LIBRARY cur_colr )
+endif()
 
 find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}")
 find_library(CURSES_FORM_LIBRARY form )
@@ -186,5 +196,7 @@ mark_as_advanced(
   CURSES_INCLUDE_DIR
   CURSES_CURSES_HAS_WSYNCUP
   CURSES_NCURSES_HAS_WSYNCUP
+  CURSES_NCURSES_HAS_CBREAK
+  CURSES_TINFO_HAS_CBREAK
   )
 

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake