diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-03-09 23:20:43 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-03-09 23:20:43 (GMT) |
| commit | 8aac17471cd35481a8b2123a6753a1bb4e31846b (patch) | |
| tree | af45cea06002b17981d1d9ebed8770371da8d273 /Modules | |
| parent | a38a37f18728201feb3efaac2442be6d60d052d3 (diff) | |
| download | CMake-8aac17471cd35481a8b2123a6753a1bb4e31846b.zip CMake-8aac17471cd35481a8b2123a6753a1bb4e31846b.tar.gz CMake-8aac17471cd35481a8b2123a6753a1bb4e31846b.tar.bz2 | |
BUG: make compiler id detection (almost) work again with sdcc 2.8.0 RC1,
mail sent to Brad for the remaining issue
don't match
INFO:compiler[" COMPILER_ID "]
which appears in the assembler file generated from the C file by sdcc, but
make sure the first character after the [ is no double quote
Alex
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 05c8ca6..dfbaefb 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -161,17 +161,17 @@ FUNCTION(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file) CMAKE_${lang}_COMPILER_ID_STRINGS LIMIT_COUNT 2 REGEX "INFO:") SET(HAVE_COMPILER_TWICE 0) FOREACH(info ${CMAKE_${lang}_COMPILER_ID_STRINGS}) - IF("${info}" MATCHES ".*INFO:compiler\\[([^]]*)\\].*") + IF("${info}" MATCHES ".*INFO:compiler\\[([^]\"]*)\\].*") IF(COMPILER_ID) SET(COMPILER_ID_TWICE 1) ENDIF(COMPILER_ID) STRING(REGEX REPLACE ".*INFO:compiler\\[([^]]*)\\].*" "\\1" COMPILER_ID "${info}") - ENDIF("${info}" MATCHES ".*INFO:compiler\\[([^]]*)\\].*") - IF("${info}" MATCHES ".*INFO:platform\\[([^]]*)\\].*") + ENDIF("${info}" MATCHES ".*INFO:compiler\\[([^]\"]*)\\].*") + IF("${info}" MATCHES ".*INFO:platform\\[([^]\"]*)\\].*") STRING(REGEX REPLACE ".*INFO:platform\\[([^]]*)\\].*" "\\1" PLATFORM_ID "${info}") - ENDIF("${info}" MATCHES ".*INFO:platform\\[([^]]*)\\].*") + ENDIF("${info}" MATCHES ".*INFO:platform\\[([^]\"]*)\\].*") ENDFOREACH(info) # Check if a valid compiler and platform were found. |