[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6125-gc32326c

[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  c32326caa94bfe3ae5910270c62740f891201f1f (commit)
       via  65ee85d0c5b0ef4c84c3cf390c0af17ef29e1504 (commit)
      from  5b66514165284f395f6f694b12c4c79b268c2600 (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=c32326caa94bfe3ae5910270c62740f891201f1f
commit c32326caa94bfe3ae5910270c62740f891201f1f
Merge: 5b66514 65ee85d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 9 10:41:34 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 9 10:41:34 2013 -0500

    Merge topic 'xcode-5.1' into next
    
    65ee85d CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.1


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65ee85d0c5b0ef4c84c3cf390c0af17ef29e1504
commit 65ee85d0c5b0ef4c84c3cf390c0af17ef29e1504
Author:     Ted Kremenek <kremenek at apple.com>
AuthorDate: Mon Dec 9 10:20:47 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 9 10:40:42 2013 -0500

    CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.1
    
    Xcode 5.1 output no longer puts "./" in the path to the linker output
    for the CompilerId test binary.  Update our regex to match the path
    with or without the component.

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 8ca5334..dd0c2bd 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -209,7 +209,7 @@ Id flags: ${testflags}
     #      ...
     #      /path/to/cc ...CompilerId${lang}/...
     # to extract the compiler front-end for the language.
-    if("${CMAKE_${lang}_COMPILER_ID_OUTPUT}" MATCHES "\nLd[^\n]*(\n[ \t]+[^\n]*)*\n[ \t]+([^ \t\r\n]+)[^\r\n]*-o[^\r\n]*CompilerId${lang}/\\./CompilerId${lang}[ \t\n\\\"]")
+    if("${CMAKE_${lang}_COMPILER_ID_OUTPUT}" MATCHES "\nLd[^\n]*(\n[ \t]+[^\n]*)*\n[ \t]+([^ \t\r\n]+)[^\r\n]*-o[^\r\n]*CompilerId${lang}/(\\./)?CompilerId${lang}[ \t\n\\\"]")
       set(_comp "${CMAKE_MATCH_2}")
       if(EXISTS "${_comp}")
         set(CMAKE_${lang}_COMPILER_ID_TOOL "${_comp}" PARENT_SCOPE)

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

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


hooks/post-receive
-- 
CMake