[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-440-ge9d45cf

[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  e9d45cf5bc5553bfc839600d310f9672b1830866 (commit)
       via  7f89552a8fc0a3877b9630fdb022eb5f16bc77a3 (commit)
      from  e0f9c5a4bd33bed1c7de8e4956b61cfd13de4c18 (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=e9d45cf5bc5553bfc839600d310f9672b1830866
commit e9d45cf5bc5553bfc839600d310f9672b1830866
Merge: e0f9c5a 7f89552
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 7 16:41:11 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 7 16:41:11 2014 -0500

    Merge topic 'xcode-ios-compiler-id' into next
    
    7f89552a Xcode: Fix compiler path detection for iOS tools on Xcode <= 5.0 (#15237)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f89552a8fc0a3877b9630fdb022eb5f16bc77a3
commit 7f89552a8fc0a3877b9630fdb022eb5f16bc77a3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 7 16:24:28 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 7 16:29:51 2014 -0500

    Xcode: Fix compiler path detection for iOS tools on Xcode <= 5.0 (#15237)
    
    Since commit v3.1.0-rc1~1^2~1 (Xcode: Fix compiler id detection for iOS
    tools, 2014-10-22) our compiler id detection project sets the product
    type to 'com.apple.product-type.bundle.unit-test'.  This causes the Ld
    command line on which we match the path to the compiler to have a
    'CompilerIdC.xctest/' component.  The commit updated our regex to match
    this, but placed it before the extra './' component that Xcode 5.0 and
    below produce.  Xcode <= 5.0 prints '/./CompilerIdC.xctest/', so switch
    the order of the two components in the regex to match it.

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 613f4b3..6c6a914 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -307,7 +307,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}.xctest)?/(\\./)?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}.xctest/)?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 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake