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 014cd12be616724899cb753884e3d808386b9941 (commit)
via f11f957949786295f6cd9e2efc5a333fa905ccc7 (commit)
from e562910dcba4de9de3fe5138d19609092917c881 (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=014cd12be616724899cb753884e3d808386b9941
commit 014cd12be616724899cb753884e3d808386b9941
Merge: e562910 f11f957
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 28 08:57:53 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Oct 28 08:57:53 2014 -0400
Merge topic 'FindCurses-include-CheckLibraryExists' into next
f11f9579 FindCurses: Include CheckLibraryExists before using it (#15220)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f11f957949786295f6cd9e2efc5a333fa905ccc7
commit f11f957949786295f6cd9e2efc5a333fa905ccc7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 28 08:52:18 2014 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Oct 28 08:53:28 2014 -0400
FindCurses: Include CheckLibraryExists before using it (#15220)
Include the module at the top unconditionally so that all code paths can
use it.
diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake
index 0184c39..a21ca89 100644
--- a/Modules/FindCurses.cmake
+++ b/Modules/FindCurses.cmake
@@ -50,6 +50,8 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
+include(${CMAKE_CURRENT_LIST_DIR}/CheckLibraryExists.cmake)
+
find_library(CURSES_CURSES_LIBRARY NAMES curses )
find_library(CURSES_NCURSES_LIBRARY NAMES ncurses )
@@ -81,7 +83,6 @@ endif()
# prefix as the library was found, if still not found, try curses.h with the
# default search paths.
if(CURSES_CURSES_LIBRARY AND CURSES_NEED_NCURSES)
- include(${CMAKE_CURRENT_LIST_DIR}/CheckLibraryExists.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake)
cmake_push_check_state()
set(CMAKE_REQUIRED_QUIET ${Curses_FIND_QUIETLY})
-----------------------------------------------------------------------
Summary of changes:
Modules/FindCurses.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
