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/FindCups.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/FindCups.cmake')
| -rw-r--r-- | Modules/FindCups.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Modules/FindCups.cmake b/Modules/FindCups.cmake index 61353caf91..51eb7c58e7 100644 --- a/Modules/FindCups.cmake +++ b/Modules/FindCups.cmake @@ -52,9 +52,8 @@ if (CUPS_INCLUDE_DIR AND EXISTS "${CUPS_INCLUDE_DIR}/cups/cups.h") unset(CUPS_VERSION_STRING) foreach(VPART MAJOR MINOR PATCH) foreach(VLINE ${cups_version_str}) - if(VLINE MATCHES "^#[\t ]*define[\t ]+CUPS_VERSION_${VPART}") - string(REGEX REPLACE "^#[\t ]*define[\t ]+CUPS_VERSION_${VPART}[\t ]+([0-9]+)$" "\\1" - CUPS_VERSION_PART "${VLINE}") + if(VLINE MATCHES "^#[\t ]*define[\t ]+CUPS_VERSION_${VPART}[\t ]+([0-9]+)$") + set(CUPS_VERSION_PART "${CMAKE_MATCH_1}") if(CUPS_VERSION_STRING) set(CUPS_VERSION_STRING "${CUPS_VERSION_STRING}.${CUPS_VERSION_PART}") else() |