diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-27 14:43:35 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-27 14:43:54 (GMT) |
| commit | fadedcbb72af08b43e918ee1796f9e3f93c66f9d (patch) | |
| tree | ed55d94f68e41d8dcb0d23f1f5893ec2e529ef88 | |
| parent | e19a62e28bc73d419c5889d71cd4a396a9060ad8 (diff) | |
| parent | 4bf102418bb1dbc93d9c6ce36dff5b5b1550df9c (diff) | |
| download | CMake-fadedcbb72af08b43e918ee1796f9e3f93c66f9d.zip CMake-fadedcbb72af08b43e918ee1796f9e3f93c66f9d.tar.gz CMake-fadedcbb72af08b43e918ee1796f9e3f93c66f9d.tar.bz2 | |
Merge topic 'FindXalanC-1.12' into release-3.18
4bf102418b FindXalanC: Fix version parsing for XalanC 1.12
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5056
| -rw-r--r-- | Modules/FindXalanC.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindXalanC.cmake b/Modules/FindXalanC.cmake index 3adaa44..54783e3 100644 --- a/Modules/FindXalanC.cmake +++ b/Modules/FindXalanC.cmake @@ -47,9 +47,9 @@ The following cache variables may also be set: function(_XalanC_GET_VERSION version_hdr) file(STRINGS ${version_hdr} _contents REGEX "^[ \t]*#define XALAN_VERSION_.*") if(_contents) - string(REGEX REPLACE "[^*]*#define XALAN_VERSION_MAJOR[ \t]+([0-9]+).*" "\\1" XalanC_MAJOR "${_contents}") - string(REGEX REPLACE "[^*]*#define XALAN_VERSION_MINOR[ \t]+([0-9]+).*" "\\1" XalanC_MINOR "${_contents}") - string(REGEX REPLACE "[^*]*#define XALAN_VERSION_REVISION[ \t]+([0-9]+).*" "\\1" XalanC_PATCH "${_contents}") + string(REGEX REPLACE "[^*]*#define XALAN_VERSION_MAJOR[ \t(]+([0-9]+).*" "\\1" XalanC_MAJOR "${_contents}") + string(REGEX REPLACE "[^*]*#define XALAN_VERSION_MINOR[ \t(]+([0-9]+).*" "\\1" XalanC_MINOR "${_contents}") + string(REGEX REPLACE "[^*]*#define XALAN_VERSION_REVISION[ \t(]+([0-9]+).*" "\\1" XalanC_PATCH "${_contents}") if(NOT XalanC_MAJOR MATCHES "^[0-9]+$") message(FATAL_ERROR "Version parsing failed for XALAN_VERSION_MAJOR!") |