diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2010-12-15 13:54:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-12-15 13:58:16 (GMT) |
| commit | 0f5c711f32ef64d161e57e80f725d8b6df932fa8 (patch) | |
| tree | cb42dbd9de1b7de71c1db80bf323fb3881e50c65 /Utilities | |
| parent | a14a8562ea5f321b0a8f6f61f4c457da298825c5 (diff) | |
| download | CMake-0f5c711f32ef64d161e57e80f725d8b6df932fa8.zip CMake-0f5c711f32ef64d161e57e80f725d8b6df932fa8.tar.gz CMake-0f5c711f32ef64d161e57e80f725d8b6df932fa8.tar.bz2 | |
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.
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/Release/Cygwin/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
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) |