diff options
| author | Rolf Eike Beer <eike@sf-mail.de> | 2014-04-06 21:30:00 +0200 |
|---|---|---|
| committer | Rolf Eike Beer <eike@sf-mail.de> | 2014-04-14 18:16:58 +0200 |
| commit | 2622bc3f65162bf6d6cb5838da6999f8b5ca75cf (patch) | |
| tree | d90da340e1dd6e104f8b6c7344f6b38e4d1f03c8 /Modules/FindEXPAT.cmake | |
| parent | 11a6b3d59ad2f75890fcdc42ec13c7a9ee1463f0 (diff) | |
| download | cmake-2622bc3f65162bf6d6cb5838da6999f8b5ca75cf.tar.gz | |
Clean up usage of if(... MATCHES regex) followed string(REGEX REPLACE regex)
The matches have already been calculated and can simply be taken from
CMAKE_MATCH_n variables. This avoids multiple compilations of the same or very
similar regular expressions.
Diffstat (limited to 'Modules/FindEXPAT.cmake')
| -rw-r--r-- | Modules/FindEXPAT.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Modules/FindEXPAT.cmake b/Modules/FindEXPAT.cmake index 6183af8ad6..653094cd32 100644 --- a/Modules/FindEXPAT.cmake +++ b/Modules/FindEXPAT.cmake @@ -38,9 +38,8 @@ if (EXPAT_INCLUDE_DIR AND EXISTS "${EXPAT_INCLUDE_DIR}/expat.h") unset(EXPAT_VERSION_STRING) foreach(VPART MAJOR MINOR MICRO) foreach(VLINE ${expat_version_str}) - if(VLINE MATCHES "^#[\t ]*define[\t ]+XML_${VPART}_VERSION") - string(REGEX REPLACE "^#[\t ]*define[\t ]+XML_${VPART}_VERSION[\t ]+([0-9]+)$" "\\1" - EXPAT_VERSION_PART "${VLINE}") + if(VLINE MATCHES "^#[\t ]*define[\t ]+XML_${VPART}_VERSION[\t ]+([0-9]+)$") + set(EXPAT_VERSION_PART "${CMAKE_MATCH_1}") if(EXPAT_VERSION_STRING) set(EXPAT_VERSION_STRING "${EXPAT_VERSION_STRING}.${EXPAT_VERSION_PART}") else() |