diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-09-24 23:40:59 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-09-24 23:40:59 +0000 |
| commit | af176b4c36333cce470a0628ab82f3d22dca516a (patch) | |
| tree | 2595952cedd90d7257bb0f1c2c200d48fc0257f4 /CMakeLists.txt | |
| parent | 878f93804fb07f96628b8748bb0255cae30b75fb (diff) | |
Update regexes to match the version string changes in r45112.
svn path=/trunk/; revision=45114
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7afaefb5b9..ab649d12b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,31 +42,31 @@ if(NOT PROJECT_MAJOR_VERSION) file(STRINGS ${CMAKE_SOURCE_DIR}/configure.ac PROJECT_MAJOR_VERSION_TMP - REGEX "^m4_define\\(version_major, [0-9]+\\)" + REGEX "^m4_define\\(\\[?version_major\\]?, *\\[?[0-9]+\\]?\\)" ) file(STRINGS ${CMAKE_SOURCE_DIR}/configure.ac PROJECT_MINOR_VERSION_TMP - REGEX "^m4_define\\(version_minor, [0-9]+\\)" + REGEX "^m4_define\\(\\[?version_minor\\]?, *\\[?[0-9]+\\]?\\)" ) file(STRINGS ${CMAKE_SOURCE_DIR}/configure.ac PROJECT_PATCH_VERSION_TMP - REGEX "^m4_define\\(version_micro, [0-9]+\\)" + REGEX "^m4_define\\(\\[?version_micro\\]?, *\\[?[0-9]+\\]?\\)" ) # XXX pull VERSION_EXTENSION out of configure.ac ? - string(REGEX REPLACE "m4_define\\(version_major, ([0-9]+)\\)" + string(REGEX REPLACE "m4_define\\(\\[?version_major\\]?, *\\[?([0-9]+)\\]?\\)" "\\1" PROJECT_MAJOR_VERSION ${PROJECT_MAJOR_VERSION_TMP} ) - string(REGEX REPLACE "m4_define\\(version_minor, ([0-9]+)\\)" + string(REGEX REPLACE "m4_define\\(\\[?version_minor\\]?, *\\[?([0-9]+)\\]?\\)" "\\1" PROJECT_MINOR_VERSION ${PROJECT_MINOR_VERSION_TMP} ) - string(REGEX REPLACE "m4_define\\(version_micro, ([0-9]+)\\)" + string(REGEX REPLACE "m4_define\\(\\[?version_micro\\]?, *\\[?([0-9]+)\\]?\\)" "\\1" PROJECT_PATCH_VERSION ${PROJECT_PATCH_VERSION_TMP} |