[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-521-g67e9bac
Brad King
brad.king at kitware.com
Fri Feb 20 08:42:30 EST 2015
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 67e9bacb4351e7526808d055348fbc5a85269f32 (commit)
via b4005a3ad9af5283f40befe7382a95c27799a90a (commit)
from 4164c62dba16fc379e7a56e7a86c6ef21680144a (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=67e9bacb4351e7526808d055348fbc5a85269f32
commit 67e9bacb4351e7526808d055348fbc5a85269f32
Merge: 4164c62 b4005a3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 08:42:29 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 20 08:42:29 2015 -0500
Merge topic 'FindCurses-remove-unused-check' into next
b4005a3a FindCurses: Drop unused check for cbreak in tinfo library
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4005a3ad9af5283f40befe7382a95c27799a90a
commit b4005a3ad9af5283f40befe7382a95c27799a90a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 20 08:39:30 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 20 08:41:36 2015 -0500
FindCurses: Drop unused check for cbreak in tinfo library
This check was first added by commit v3.0.0-rc5~6^2 (FindCurses: Detect
and satisfy ncurses dependency on tinfo, 2014-01-17), but it is not
correctly conditioned on existence of the tinfo library and fails if the
code path is taken but tinfo is not found. However, since commit
v3.2.0-rc1~369^2 (FindCurses: Drop search for deprecated HP-UX cur_colr
library, 2014-11-17) the result of the check is not used, so simply drop
it.
diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake
index f94bd09..e236c24 100644
--- a/Modules/FindCurses.cmake
+++ b/Modules/FindCurses.cmake
@@ -128,8 +128,6 @@ if(CURSES_USE_NCURSES)
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()
else()
get_filename_component(_cursesLibDir "${CURSES_CURSES_LIBRARY}" PATH)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindCurses.cmake | 2 --
1 file changed, 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list