[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2826-g1df4bbf

[Brad King]

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  1df4bbf3c3bf547017fe7768911f58553a306a9a (commit)
       via  1f646c6ce0766f8ab59868e7cac24034e6966504 (commit)
       via  0e4a2c7e3251c305cc4a9a02fa32011b3c142f5a (commit)
      from  716cf7dca8e12e4692f5a78727e0cb393388df2b (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=1df4bbf3c3bf547017fe7768911f58553a306a9a
commit 1df4bbf3c3bf547017fe7768911f58553a306a9a
Merge: 716cf7d 1f646c6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 6 15:29:02 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 6 15:29:02 2014 -0400

    Merge topic 'ncurses-tinfo' into next
    
    1f646c6c FindCurses: Detect and satisfy ncurses dependency on tinfo
    0e4a2c7e FindCurses: Honor CURSES_NEED_NCURSES when curses is found


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f646c6ce0766f8ab59868e7cac24034e6966504
commit 1f646c6ce0766f8ab59868e7cac24034e6966504
Author:     Mark Wright <gienah at gentoo.org>
AuthorDate: Fri Jan 17 11:34:58 2014 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 6 15:29:33 2014 -0400

    FindCurses: Detect and satisfy ncurses dependency on tinfo
    
    When ncurses is built with USE=tinfo we need to find "tinfo" as a
    dependency of the main library.  Otherwise 'cbreak' is missing:
    
      ld: ...: 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.
    
    Applied-by: Rolf Eike Beer <eike at sf-mail.de>

diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake
index 7948551..a453a67 100644
--- a/Modules/FindCurses.cmake
+++ b/Modules/FindCurses.cmake
@@ -135,10 +135,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 )
@@ -182,5 +192,7 @@ mark_as_advanced(
   CURSES_INCLUDE_DIR
   CURSES_CURSES_HAS_WSYNCUP
   CURSES_NCURSES_HAS_WSYNCUP
+  CURSES_NCURSES_HAS_CBREAK
+  CURSES_TINFO_HAS_CBREAK
   )
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e4a2c7e3251c305cc4a9a02fa32011b3c142f5a
commit 0e4a2c7e3251c305cc4a9a02fa32011b3c142f5a
Author:     Mark Wright <gienah at gentoo.org>
AuthorDate: Fri Jan 17 11:34:58 2014 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 6 15:29:14 2014 -0400

    FindCurses: Honor CURSES_NEED_NCURSES when curses is found
    
    Take our CURSES_USE_NCURSES code path when CURSES_NEED_NCURSES is
    enabled even if CURSES_CURSES_LIBRARY also happens to be found.
    
    Applied-by: Rolf Eike Beer <eike at sf-mail.de>

diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake
index 971edb7..7948551 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

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

Summary of changes:


hooks/post-receive
-- 
CMake