From 0f5c711f32ef64d161e57e80f725d8b6df932fa8 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 15 Dec 2010 08:54:59 -0500 Subject: [PATCH] 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. --- Utilities/Release/Cygwin/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Utilities/Release/Cygwin/CMakeLists.txt b/Utilities/Release/Cygwin/CMakeLists.txt index 0c274f3b0..2420c97d9 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)