[Cmake-commits] [cmake-commits] king committed CMakeCCompilerId.c.in 1.4 1.5 CMakeCXXCompilerId.cpp.in 1.3 1.4 CMakeFortranCompilerId.F.in 1.2 1.3

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeCCompilerId.c.in CMakeCXXCompilerId.cpp.in 
	CMakeFortranCompilerId.F.in 
Log Message:
ENH: Check _SGI_COMPILER_VERSION for compiler id

Some SGI compilers define _SGI_COMPILER_VERSION in addition to the old
_COMPILER_VERSION preprocessor symbol.  It is more distinctive, so we
should check it in case the old one is ever removed.


Index: CMakeCCompilerId.c.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCCompilerId.c.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** CMakeCCompilerId.c.in	7 Aug 2008 13:09:45 -0000	1.4
--- CMakeCCompilerId.c.in	14 Jul 2009 19:17:21 -0000	1.5
***************
*** 53,57 ****
  # define COMPILER_ID "SDCC"
  
! #elif defined(_COMPILER_VERSION)
  # define COMPILER_ID "MIPSpro"
  
--- 53,57 ----
  # define COMPILER_ID "SDCC"
  
! #elif defined(_SGI_COMPILER_VERSION) || defined(_COMPILER_VERSION)
  # define COMPILER_ID "MIPSpro"
  

Index: CMakeCXXCompilerId.cpp.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXCompilerId.cpp.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** CMakeCXXCompilerId.cpp.in	7 Aug 2008 13:09:45 -0000	1.3
--- CMakeCXXCompilerId.cpp.in	14 Jul 2009 19:17:21 -0000	1.4
***************
*** 44,48 ****
  # define COMPILER_ID "ADSP"
  
! #elif defined(_COMPILER_VERSION)
  # define COMPILER_ID "MIPSpro"
  
--- 44,48 ----
  # define COMPILER_ID "ADSP"
  
! #elif defined(_SGI_COMPILER_VERSION) || defined(_COMPILER_VERSION)
  # define COMPILER_ID "MIPSpro"
  

Index: CMakeFortranCompilerId.F.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranCompilerId.F.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** CMakeFortranCompilerId.F.in	14 Jul 2009 19:16:59 -0000	1.2
--- CMakeFortranCompilerId.F.in	14 Jul 2009 19:17:21 -0000	1.3
***************
*** 13,17 ****
  #elif defined(__PGI)
          PRINT *, 'INFO:compiler[PGI]'
! #elif defined(_COMPILER_VERSION)
          PRINT *, 'INFO:compiler[MIPSpro]'
  #       if 0
--- 13,17 ----
  #elif defined(__PGI)
          PRINT *, 'INFO:compiler[PGI]'
! #elif defined(_SGI_COMPILER_VERSION) || defined(_COMPILER_VERSION)
          PRINT *, 'INFO:compiler[MIPSpro]'
  #       if 0