[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4078-g04bb8e5

[Brad King]

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  04bb8e59f11f972ae196033a8fe328c59c984f93 (commit)
       via  8c891f86cc2cbe346d4f6459d01c6d24c27ec2f1 (commit)
       via  dccc2b84a7d4abe0a0d3e064aa2a067ab341ecaf (commit)
       via  5ce44295c6a373c97364f7a3a2290d41b51e71dc (commit)
       via  b91655585e14e680ce0bce1729c1281632d78504 (commit)
      from  3e44b0e27c10b197788cd985db279465dd654be6 (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=04bb8e59f11f972ae196033a8fe328c59c984f93
commit 04bb8e59f11f972ae196033a8fe328c59c984f93
Merge: 3e44b0e 8c891f8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 4 07:56:09 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 4 07:56:09 2013 -0400

    Merge topic 'vs-compiler-id-tolerate-diagnostics' into next
    
    8c891f8 VS: Tolerate diagnostic output while detecting cl (#14387)
    dccc2b8 CMake Nightly Date Stamp
    5ce4429 CMake Nightly Date Stamp
    b916555 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c891f86cc2cbe346d4f6459d01c6d24c27ec2f1
commit 8c891f86cc2cbe346d4f6459d01c6d24c27ec2f1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 3 13:58:42 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 3 14:04:25 2013 -0400

    VS: Tolerate diagnostic output while detecting cl (#14387)
    
    When the VS IDE build output setting
    
      Tools -> Options -> Projects and Solutions ->
       Build and Run -> MSBuild project output verbosity
    
    is set to "Diagnostic" the build output contains a " (TaskId:###)"
    suffix on the CMAKE_<lang>_COMPILER= line used to extract the compiler
    executable location.  Strip this suffix before checking that the
    reported location exists.

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index ebd9ce0..cc36ec4 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -157,7 +157,8 @@ Id flags: ${testflags}
       )
     # Match the compiler location line printed out.
     if("${CMAKE_${lang}_COMPILER_ID_OUTPUT}" MATCHES "CMAKE_${lang}_COMPILER=([^%\r\n]+)[\r\n]")
-      set(_comp "${CMAKE_MATCH_1}")
+      # Strip VS diagnostic output from the end of the line.
+      string(REGEX REPLACE " \\(TaskId:[0-9]*\\)$" "" _comp "${CMAKE_MATCH_1}")
       if(EXISTS "${_comp}")
         file(TO_CMAKE_PATH "${_comp}" _comp)
         set(CMAKE_${lang}_COMPILER_ID_TOOL "${_comp}" PARENT_SCOPE)

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

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |    3 ++-
 Source/CMakeVersion.cmake              |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake