[Cmake-commits] [cmake-commits] alex committed CMakeDetermineCompilerId.cmake 1.18 1.19

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv24609

Modified Files:
	CMakeDetermineCompilerId.cmake 
Log Message:
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


Index: CMakeDetermineCompilerId.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCompilerId.cmake,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** CMakeDetermineCompilerId.cmake	25 Feb 2008 14:23:14 -0000	1.18
--- CMakeDetermineCompilerId.cmake	9 Mar 2008 23:20:43 -0000	1.19
***************
*** 162,166 ****
      SET(HAVE_COMPILER_TWICE 0)
      FOREACH(info ${CMAKE_${lang}_COMPILER_ID_STRINGS})
!       IF("${info}" MATCHES ".*INFO:compiler\\[([^]]*)\\].*")
          IF(COMPILER_ID)
            SET(COMPILER_ID_TWICE 1)
--- 162,166 ----
      SET(HAVE_COMPILER_TWICE 0)
      FOREACH(info ${CMAKE_${lang}_COMPILER_ID_STRINGS})
!       IF("${info}" MATCHES ".*INFO:compiler\\[([^]\"]*)\\].*")
          IF(COMPILER_ID)
            SET(COMPILER_ID_TWICE 1)
***************
*** 168,176 ****
          STRING(REGEX REPLACE ".*INFO:compiler\\[([^]]*)\\].*" "\\1"
            COMPILER_ID "${info}")
!       ENDIF("${info}" MATCHES ".*INFO:compiler\\[([^]]*)\\].*")
!       IF("${info}" MATCHES ".*INFO:platform\\[([^]]*)\\].*")
          STRING(REGEX REPLACE ".*INFO:platform\\[([^]]*)\\].*" "\\1"
            PLATFORM_ID "${info}")
!       ENDIF("${info}" MATCHES ".*INFO:platform\\[([^]]*)\\].*")
      ENDFOREACH(info)
  
--- 168,176 ----
          STRING(REGEX REPLACE ".*INFO:compiler\\[([^]]*)\\].*" "\\1"
            COMPILER_ID "${info}")
!       ENDIF("${info}" MATCHES ".*INFO:compiler\\[([^]\"]*)\\].*")
!       IF("${info}" MATCHES ".*INFO:platform\\[([^]\"]*)\\].*")
          STRING(REGEX REPLACE ".*INFO:platform\\[([^]]*)\\].*" "\\1"
            PLATFORM_ID "${info}")
!       ENDIF("${info}" MATCHES ".*INFO:platform\\[([^]\"]*)\\].*")
      ENDFOREACH(info)