[Cmake-commits] [cmake-commits] alex committed CMakeFindEclipseCDT4.cmake 1.3 1.4

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeFindEclipseCDT4.cmake 
Log Message:
The check for include dirs and builtin macros also works with the Intel compiler

Alex


Index: CMakeFindEclipseCDT4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFindEclipseCDT4.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** CMakeFindEclipseCDT4.cmake	16 Sep 2009 18:37:21 -0000	1.3
--- CMakeFindEclipseCDT4.cmake	17 Sep 2009 17:08:35 -0000	1.4
***************
*** 54,70 ****
  ENDIF(_orig_lang)
  
! # Now check for C
! IF ("${CMAKE_C_COMPILER_ID}" MATCHES GNU  AND NOT  CMAKE_ECLIPSE_C_SYSTEM_INCLUDE_DIRS)
!   _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c _dirs _defines)
!   SET(CMAKE_ECLIPSE_C_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE INTERNAL "C compiler system include directories")
!   SET(CMAKE_ECLIPSE_C_SYSTEM_DEFINED_MACROS "${_defines}" CACHE INTERNAL "C compiler system defined macros")
! ENDIF ("${CMAKE_C_COMPILER_ID}" MATCHES GNU  AND NOT  CMAKE_ECLIPSE_C_SYSTEM_INCLUDE_DIRS)
  
  # And now the same for C++
! IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU  AND NOT  CMAKE_ECLIPSE_CXX_SYSTEM_INCLUDE_DIRS)
!   _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c++ _dirs _defines)
!   SET(CMAKE_ECLIPSE_CXX_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE INTERNAL "CXX compiler system include directories")
!   SET(CMAKE_ECLIPSE_CXX_SYSTEM_DEFINED_MACROS "${_defines}" CACHE INTERNAL "CXX compiler system defined macros")
! ENDIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU  AND NOT  CMAKE_ECLIPSE_CXX_SYSTEM_INCLUDE_DIRS)
  
  # Restore original LC_ALL, LC_MESSAGES, and LANG
--- 54,74 ----
  ENDIF(_orig_lang)
  
! # Now check for C, works for gcc and Intel compiler at least
! IF (NOT CMAKE_ECLIPSE_C_SYSTEM_INCLUDE_DIRS)
!   IF ("${CMAKE_C_COMPILER_ID}" MATCHES GNU  OR  "${CMAKE_C_COMPILER_ID}" MATCHES Intel)
!     _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c _dirs _defines)
!     SET(CMAKE_ECLIPSE_C_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE INTERNAL "C compiler system include directories")
!     SET(CMAKE_ECLIPSE_C_SYSTEM_DEFINED_MACROS "${_defines}" CACHE INTERNAL "C compiler system defined macros")
!   ENDIF ("${CMAKE_C_COMPILER_ID}" MATCHES GNU  OR  "${CMAKE_C_COMPILER_ID}" MATCHES Intel)
! ENDIF (NOT CMAKE_ECLIPSE_C_SYSTEM_INCLUDE_DIRS)
  
  # And now the same for C++
! IF (NOT CMAKE_ECLIPSE_CXX_SYSTEM_INCLUDE_DIRS)
!   IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU  OR  "${CMAKE_CXX_COMPILER_ID}" MATCHES Intel)
!     _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c++ _dirs _defines)
!     SET(CMAKE_ECLIPSE_CXX_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE INTERNAL "CXX compiler system include directories")
!     SET(CMAKE_ECLIPSE_CXX_SYSTEM_DEFINED_MACROS "${_defines}" CACHE INTERNAL "CXX compiler system defined macros")
!   ENDIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU  OR  "${CMAKE_CXX_COMPILER_ID}" MATCHES Intel)
! ENDIF (NOT CMAKE_ECLIPSE_CXX_SYSTEM_INCLUDE_DIRS)
  
  # Restore original LC_ALL, LC_MESSAGES, and LANG