diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2012-04-29 21:15:12 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2012-04-29 21:15:12 -0700 |
| commit | 816e34e1b5b34a25d0e4eeb469a3d6994779edde (patch) | |
| tree | f79f053d5a490dec11b9843894eaae0d81287b34 | |
| parent | dbcdbf8c41db8d03e47fdbb0483f2705f8ac77f7 (diff) | |
| download | zlib-816e34e1b5b34a25d0e4eeb469a3d6994779edde.tar.gz zlib-816e34e1b5b34a25d0e4eeb469a3d6994779edde.tar.bz2 zlib-816e34e1b5b34a25d0e4eeb469a3d6994779edde.zip | |
Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler].
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 09725af..09ae69d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -128,7 +128,7 @@ endif() | |||
| 128 | 128 | ||
| 129 | # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION | 129 | # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION |
| 130 | file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents) | 130 | file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents) |
| 131 | string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([0-9A-Za-z.]+)\".*" | 131 | string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*" |
| 132 | "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents}) | 132 | "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents}) |
| 133 | 133 | ||
| 134 | if(MINGW) | 134 | if(MINGW) |