[Cmake-commits] CMake branch, next, updated. v2.8.4-1332-ge37961c

[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  e37961cd7d04b4f57adf387f0c5eb811138229d4 (commit)
       via  6a38cab2de2a529779c18e0c3872112e3851665b (commit)
       via  4371147ef4549feeb88c080cf5ba99281cbb7df3 (commit)
       via  4ccb44e7c5cdb1d6e9dfa9e1c62c6ee4c8597c06 (commit)
      from  08e888d6095375d92da36eb6345bd193ee496a58 (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=e37961cd7d04b4f57adf387f0c5eb811138229d4
commit e37961cd7d04b4f57adf387f0c5eb811138229d4
Merge: 08e888d 6a38cab
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Sun Apr 3 12:19:45 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 3 12:19:45 2011 -0400

    Merge topic 'BuiltinIncludeDirFixesForEclipse' into next
    
    6a38cab Don't skip the last builtin include dir for the Eclipse project file
    4371147 Fix parsing include dirs and builtin macros for CXX-only projects
    4ccb44e KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a38cab2de2a529779c18e0c3872112e3851665b
commit 6a38cab2de2a529779c18e0c3872112e3851665b
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sun Apr 3 18:07:27 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sun Apr 3 18:07:27 2011 +0200

    Don't skip the last builtin include dir for the Eclipse project file
    
    The regex was slightly wrong, it excluded the last line, so e.g.
    /usr/include/ didn't end up in the .cproject file.
    
    Thanks to Shash Chatterjee for the patch.
    
    Alex

diff --git a/Modules/CMakeFindEclipseCDT4.cmake b/Modules/CMakeFindEclipseCDT4.cmake
index 4c58f56..a756e64 100644
--- a/Modules/CMakeFindEclipseCDT4.cmake
+++ b/Modules/CMakeFindEclipseCDT4.cmake
@@ -45,7 +45,7 @@ MACRO(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _resultIncludeDirs _resultDefines
   FILE(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy")
 
   # First find the system include dirs:
-  IF( "${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list" )
+  IF( "${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+ *\n) *End of (search) list" )
 
     # split the output into lines and then remove leading and trailing spaces from each of them:
     STRING(REGEX MATCHALL "[^\n]+\n" _includeLines "${CMAKE_MATCH_1}")
@@ -54,7 +54,7 @@ MACRO(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _resultIncludeDirs _resultDefines
       LIST(APPEND ${_resultIncludeDirs} "${_includePath}")
     ENDFOREACH(nextLine)
 
-  ENDIF( "${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list" )
+  ENDIF( "${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+ *\n) *End of (search) list" )
 
 
   # now find the builtin macros:

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4371147ef4549feeb88c080cf5ba99281cbb7df3
commit 4371147ef4549feeb88c080cf5ba99281cbb7df3
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sun Apr 3 18:00:35 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sun Apr 3 18:00:35 2011 +0200

    Fix parsing include dirs and builtin macros for CXX-only projects
    
    Alex

diff --git a/Modules/CMakeFindEclipseCDT4.cmake b/Modules/CMakeFindEclipseCDT4.cmake
index fbcdc98..4c58f56 100644
--- a/Modules/CMakeFindEclipseCDT4.cmake
+++ b/Modules/CMakeFindEclipseCDT4.cmake
@@ -32,7 +32,13 @@ MACRO(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _resultIncludeDirs _resultDefines
   SET(${_resultIncludeDirs})
   SET(_gccOutput)
   FILE(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy" "\n" )
-  EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -v -E -x ${_lang} -dD dummy
+
+  IF (${_lang} STREQUAL "c++")
+    SET(_compilerExecutable "${CMAKE_CXX_COMPILER}")
+  ELSE (${_lang} STREQUAL "c++")
+    SET(_compilerExecutable "${CMAKE_C_COMPILER}")
+  ENDIF (${_lang} STREQUAL "c++")
+  EXECUTE_PROCESS(COMMAND ${_compilerExecutable} -v -E -x ${_lang} -dD dummy
                   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles
                   ERROR_VARIABLE _gccOutput
                   OUTPUT_VARIABLE _gccStdout )

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

Summary of changes:
 Modules/CMakeFindEclipseCDT4.cmake |   12 +++++++++---
 Source/kwsys/kwsysDateStamp.cmake  |    2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake