diff options
| author | Rolf Eike Beer <eike@sf-mail.de> | 2014-04-06 19:30:00 (GMT) |
|---|---|---|
| committer | Rolf Eike Beer <eike@sf-mail.de> | 2014-04-14 16:16:58 (GMT) |
| commit | 2622bc3f65162bf6d6cb5838da6999f8b5ca75cf (patch) | |
| tree | d90da340e1dd6e104f8b6c7344f6b38e4d1f03c8 /Modules/CMakeDetermineCompilerId.cmake | |
| parent | 11a6b3d59ad2f75890fcdc42ec13c7a9ee1463f0 (diff) | |
| download | CMake-2622bc3f65162bf6d6cb5838da6999f8b5ca75cf.zip CMake-2622bc3f65162bf6d6cb5838da6999f8b5ca75cf.tar.gz CMake-2622bc3f65162bf6d6cb5838da6999f8b5ca75cf.tar.bz2 | |
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/CMakeDetermineCompilerId.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 067892d..f977639 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -360,28 +360,23 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file) if(COMPILER_ID) set(COMPILER_ID_TWICE 1) endif() - string(REGEX REPLACE ".*INFO:compiler\\[([^]]*)\\].*" "\\1" - COMPILER_ID "${info}") + set(COMPILER_ID "${CMAKE_MATCH_1}") endif() if("${info}" MATCHES ".*INFO:platform\\[([^]\"]*)\\].*") - string(REGEX REPLACE ".*INFO:platform\\[([^]]*)\\].*" "\\1" - PLATFORM_ID "${info}") + set(PLATFORM_ID "${CMAKE_MATCH_1}") endif() if("${info}" MATCHES ".*INFO:arch\\[([^]\"]*)\\].*") - string(REGEX REPLACE ".*INFO:arch\\[([^]]*)\\].*" "\\1" - ARCHITECTURE_ID "${info}") + set(ARCHITECTURE_ID "${CMAKE_MATCH_1}") endif() if("${info}" MATCHES ".*INFO:compiler_version\\[([^]\"]*)\\].*") - string(REGEX REPLACE ".*INFO:compiler_version\\[([^]]*)\\].*" "\\1" COMPILER_VERSION "${info}") - string(REGEX REPLACE "^0+([0-9])" "\\1" COMPILER_VERSION "${COMPILER_VERSION}") + string(REGEX REPLACE "^0+([0-9])" "\\1" COMPILER_VERSION "${CMAKE_MATCH_1}") string(REGEX REPLACE "\\.0+([0-9])" ".\\1" COMPILER_VERSION "${COMPILER_VERSION}") endif() if("${info}" MATCHES ".*INFO:simulate\\[([^]\"]*)\\].*") set(SIMULATE_ID "${CMAKE_MATCH_1}") endif() if("${info}" MATCHES ".*INFO:simulate_version\\[([^]\"]*)\\].*") - set(SIMULATE_VERSION "${CMAKE_MATCH_1}") - string(REGEX REPLACE "^0+([0-9])" "\\1" SIMULATE_VERSION "${SIMULATE_VERSION}") + string(REGEX REPLACE "^0+([0-9])" "\\1" SIMULATE_VERSION "${CMAKE_MATCH_1}") string(REGEX REPLACE "\\.0+([0-9])" ".\\1" SIMULATE_VERSION "${SIMULATE_VERSION}") endif() if("${info}" MATCHES ".*INFO:qnxnto") |