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

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeCCompilerId.c.in CMakeCXXCompilerId.cpp.in 
	CMakeFortranCompilerId.F.in 
Log Message:
Teach compiler id about VisualAge -> XL rebranding

IBM rebranded its VisualAge compiler to XL starting at version 8.0.  We
use the compiler id "XL" for newer versions and "VisualAge" for older
versions.  We now also recognize the "z/OS" compiler, which is distinct
from XL.


Index: CMakeCCompilerId.c.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCCompilerId.c.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** CMakeCCompilerId.c.in	14 Jul 2009 19:17:21 -0000	1.5
--- CMakeCCompilerId.c.in	7 Aug 2009 14:13:02 -0000	1.6
***************
*** 26,30 ****
  
  #elif defined(__IBMC__)
! # define COMPILER_ID "VisualAge"
  
  #elif defined(__PGI)
--- 26,36 ----
  
  #elif defined(__IBMC__)
! # if defined(__COMPILER_VER__)
! #  define COMPILER_ID "zOS"
! # elif __IBMC__ >= 800
! #  define COMPILER_ID "XL"
! # else
! #  define COMPILER_ID "VisualAge"
! # endif
  
  #elif defined(__PGI)

Index: CMakeCXXCompilerId.cpp.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXCompilerId.cpp.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** CMakeCXXCompilerId.cpp.in	14 Jul 2009 19:17:21 -0000	1.4
--- CMakeCXXCompilerId.cpp.in	7 Aug 2009 14:13:03 -0000	1.5
***************
*** 28,32 ****
  
  #elif defined(__IBMCPP__)
! # define COMPILER_ID "VisualAge"
  
  #elif defined(__PGI)
--- 28,38 ----
  
  #elif defined(__IBMCPP__)
! # if defined(__COMPILER_VER__)
! #  define COMPILER_ID "zOS"
! # elif __IBMCPP__ >= 800
! #  define COMPILER_ID "XL"
! # else
! #  define COMPILER_ID "VisualAge"
! # endif
  
  #elif defined(__PGI)

Index: CMakeFortranCompilerId.F.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranCompilerId.F.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** CMakeFortranCompilerId.F.in	14 Jul 2009 19:17:21 -0000	1.3
--- CMakeFortranCompilerId.F.in	7 Aug 2009 14:13:04 -0000	1.4
***************
*** 9,14 ****
  #elif defined(__GNUC__)
          PRINT *, 'INFO:compiler[GNU]'
! #elif defined(__IBM__) || defined(__IBMC__)
          PRINT *, 'INFO:compiler[VisualAge]'
  #elif defined(__PGI)
          PRINT *, 'INFO:compiler[PGI]'
--- 9,20 ----
  #elif defined(__GNUC__)
          PRINT *, 'INFO:compiler[GNU]'
! #elif defined(__IBMC__)
! # if defined(__COMPILER_VER__)
!         PRINT *, 'INFO:compiler[zOS]'
! # elif __IBMC__ >= 800
!         PRINT *, 'INFO:compiler[XL]'
! # else
          PRINT *, 'INFO:compiler[VisualAge]'
+ # endif
  #elif defined(__PGI)
          PRINT *, 'INFO:compiler[PGI]'