[Cmake-commits] CMake branch, next, updated. v2.8.3-899-g42682b7

[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  42682b7fb8e56d8f91260ab3fa3f8f7edfbf7495 (commit)
       via  0f5c711f32ef64d161e57e80f725d8b6df932fa8 (commit)
      from  78858b0876646bbbff2a23470c9d16df526d2338 (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=42682b7fb8e56d8f91260ab3fa3f8f7edfbf7495
commit 42682b7fb8e56d8f91260ab3fa3f8f7edfbf7495
Merge: 78858b0 0f5c711
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 15 09:01:22 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 15 09:01:22 2010 -0500

    Merge topic 'release-cygwin-ncurses' into next
    
    0f5c711 Cygwin: Fix release script libncurses search patterns (#10766)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f5c711f32ef64d161e57e80f725d8b6df932fa8
commit 0f5c711f32ef64d161e57e80f725d8b6df932fa8
Author:     Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
AuthorDate: Wed Dec 15 08:54:59 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 15 08:58:16 2010 -0500

    Cygwin: Fix release script libncurses search patterns (#10766)
    
    With the switch to upstream ncurses "ABI 6", Cygwin's ncurses has YA ABI
    bump and is now libncurses10.  However, the regex used to determine in
    Utilities/Release/Cygwin/CMakeLists.txt which libncurses is being used
    does not handle multiple-digit ABIs.
    
    libncurses8 was the first version to be built with libtool and therefore
    contains a hyphen (cygncurses-8.dll).  It was first introduced in 2004,
    so it should be sufficiently old to rely on.  Furthermore, libncurses7
    has a serious flaw in that it completely breaks if rebased.
    
    Therefore the easiest solution is to only look at the hyphened versions
    and change the regex accordingly.

diff --git a/Utilities/Release/Cygwin/CMakeLists.txt b/Utilities/Release/Cygwin/CMakeLists.txt
index 0c274f3..2420c97 100644
--- a/Utilities/Release/Cygwin/CMakeLists.txt
+++ b/Utilities/Release/Cygwin/CMakeLists.txt
@@ -1,8 +1,8 @@
-FILE(GLOB INSTALLED_CURSES /usr/bin/cygncurses*.dll)
+FILE(GLOB INSTALLED_CURSES /usr/bin/cygncurses-*.dll)
 SET(MAX 0)
 FOREACH(f ${INSTALLED_CURSES})
   IF(NOT "${f}" MATCHES "\\+")
-    STRING(REGEX REPLACE ".*([0-9]).dll" "\\1" NUMBER "${f}")
+    STRING(REGEX REPLACE ".*-([0-9]*).dll" "\\1" NUMBER "${f}")
     IF(NUMBER GREATER MAX)
       SET(MAX ${NUMBER}) 
     ENDIF(NUMBER GREATER MAX)

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

Summary of changes:
 Utilities/Release/Cygwin/CMakeLists.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake