[Cmake-commits] CMake branch, next, updated. v2.8.9-288-g691b9e5

[Peter Kuemmel]

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  691b9e5c6e27596f0367af46b56d957e38a1e45f (commit)
       via  0af27f1f2a18c9e2335d22444777f1a6559000b5 (commit)
       via  f32e7957b4f6cb57e396ec018947d46420072671 (commit)
       via  496d33a65dbf87fbbd3dd20f6b1b8c9e73e8372f (commit)
       via  78b30939a8b5c0706ee17a01bc70952ec82fee45 (commit)
      from  3fe05b56ecc9857504a6699d702f9377e430ee1c (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=691b9e5c6e27596f0367af46b56d957e38a1e45f
commit 691b9e5c6e27596f0367af46b56d957e38a1e45f
Merge: 3fe05b5 0af27f1
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Mon Aug 27 08:51:03 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 27 08:51:03 2012 -0400

    Merge topic 'cmcldeps-icl' into next
    
    0af27f1 Ninja: also detect /showInclude prefix for icl
    f32e795 CMake Nightly Date Stamp
    496d33a CMake Nightly Date Stamp
    78b3093 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0af27f1f2a18c9e2335d22444777f1a6559000b5
commit 0af27f1f2a18c9e2335d22444777f1a6559000b5
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Mon Aug 27 14:49:51 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Mon Aug 27 14:49:51 2012 +0200

    Ninja: also detect /showInclude prefix for icl

diff --git a/Modules/CMakeClDeps.cmake b/Modules/CMakeClDeps.cmake
index b52641c..0214ead 100644
--- a/Modules/CMakeClDeps.cmake
+++ b/Modules/CMakeClDeps.cmake
@@ -26,12 +26,9 @@ if(MSVC_C_ARCHITECTURE_ID AND CMAKE_GENERATOR MATCHES "Ninja" AND CMAKE_C_COMPIL
   file(WRITE ${showdir}/foo.h "\n")
   file(WRITE ${showdir}/main.c "#include \"foo.h\" \nint main(){}\n")
   execute_process(COMMAND ${CMAKE_C_COMPILER} /nologo /showIncludes ${showdir}/main.c
-                  WORKING_DIRECTORY ${showdir} OUTPUT_VARIABLE showOut)
-  string(REPLACE main.c "" showOut1 ${showOut})
-  string(REPLACE "/" "\\" header1 ${showdir}/foo.h)
-  string(TOLOWER ${header1} header2)
-  string(REPLACE ${header2} "" showOut2 ${showOut1})
-  string(REPLACE "\n" "" showOut3 ${showOut2})
+                  WORKING_DIRECTORY ${showdir} OUTPUT_VARIABLE outLine)
+  string(REGEX MATCH "\n([^:]*:[^:]*:[ \t]*)" tmp "${outLine}")
+  set(localizedPrefix "${CMAKE_MATCH_1}")
   set(SET_CMAKE_CMCLDEPS_EXECUTABLE   "set(CMAKE_CMCLDEPS_EXECUTABLE \"${CMAKE_CMCLDEPS_EXECUTABLE}\")")
-  set(SET_CMAKE_CL_SHOWINCLUDE_PREFIX "set(CMAKE_CL_SHOWINCLUDE_PREFIX \"${showOut3}\")")
+  set(SET_CMAKE_CL_SHOWINCLUDE_PREFIX "set(CMAKE_CL_SHOWINCLUDE_PREFIX \"${localizedPrefix}\")")
 endif()

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

Summary of changes:
 Modules/CMakeClDeps.cmake |   11 ++++-------
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake