[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2060-g254eb37

[Alexander Neundorf]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  254eb37ffa84d0e6439cb51870cc69b42788aae4 (commit)
       via  a396b6ece239d35436d9c3ca6de20b2fcea74749 (commit)
      from  3e627b63fa85cc3cc8fa524905f7f121a1b5bbd1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=254eb37ffa84d0e6439cb51870cc69b42788aae4
commit 254eb37ffa84d0e6439cb51870cc69b42788aae4
Merge: 3e627b6 a396b6e
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Sun Feb 10 13:53:02 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 10 13:53:02 2013 -0500

    Merge topic 'EclipseDetectClangIncludeDirs' into next
    
    a396b6e Eclipse: also detect include dirs and macro for clang (#13823)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a396b6ece239d35436d9c3ca6de20b2fcea74749
commit a396b6ece239d35436d9c3ca6de20b2fcea74749
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sun Feb 10 18:58:27 2013 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sun Feb 10 18:58:27 2013 +0100

    Eclipse: also detect include dirs and macro for clang (#13823)
    
    Alex

diff --git a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
index 1fa0157..365d381 100644
--- a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
+++ b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
@@ -90,7 +90,7 @@ set(ENV{LANG}        C)
 
 # Now check for C, works for gcc and Intel compiler at least
 if (NOT CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS)
-  if ("${CMAKE_C_COMPILER_ID}" MATCHES GNU  OR  "${CMAKE_C_COMPILER_ID}" MATCHES Intel)
+  if ("${CMAKE_C_COMPILER_ID}" MATCHES GNU  OR  "${CMAKE_C_COMPILER_ID}" MATCHES Intel  OR  "${CMAKE_C_COMPILER_ID}" MATCHES Clang)
     _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c _dirs _defines)
     set(CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE INTERNAL "C compiler system include directories")
     set(CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS "${_defines}" CACHE INTERNAL "C compiler system defined macros")
@@ -99,7 +99,7 @@ endif ()
 
 # And now the same for C++
 if (NOT CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS)
-  if ("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU  OR  "${CMAKE_CXX_COMPILER_ID}" MATCHES Intel)
+  if ("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU  OR  "${CMAKE_CXX_COMPILER_ID}" MATCHES Intel  OR  "${CMAKE_CXX_COMPILER_ID}" MATCHES Clang)
     _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c++ _dirs _defines)
     set(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE INTERNAL "CXX compiler system include directories")
     set(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS "${_defines}" CACHE INTERNAL "CXX compiler system defined macros")

-----------------------------------------------------------------------

Summary of changes:
 ...atorDetermineCompilerMacrosAndIncludeDirs.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake