[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-734-g585e9da

[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  585e9da0e2262c11b7be1a728f88dddb31c2ed0b (commit)
       via  00dae1a7ccfa4b375c2044b8a435b9728ac46366 (commit)
      from  5fdda16a1b39d00ab50581ef14430188e0cebe85 (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=585e9da0e2262c11b7be1a728f88dddb31c2ed0b
commit 585e9da0e2262c11b7be1a728f88dddb31c2ed0b
Merge: 5fdda16 00dae1a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 30 10:14:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 30 10:14:02 2015 -0400

    Merge topic 'compiler-id-xcode-tool-per-language' into next
    
    00dae1a7 fixup! CMakeDetermineCompilerId: Use per-language regex to match Xcode


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00dae1a7ccfa4b375c2044b8a435b9728ac46366
commit 00dae1a7ccfa4b375c2044b8a435b9728ac46366
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 30 10:13:41 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 30 10:13:41 2015 -0400

    fixup! CMakeDetermineCompilerId: Use per-language regex to match Xcode

diff --git a/Modules/CMakeDetermineFortranCompiler.cmake b/Modules/CMakeDetermineFortranCompiler.cmake
index 52ec25a..911ffac 100644
--- a/Modules/CMakeDetermineFortranCompiler.cmake
+++ b/Modules/CMakeDetermineFortranCompiler.cmake
@@ -127,6 +127,14 @@ if(NOT CMAKE_Fortran_COMPILER_ID_RUN)
   set(CMAKE_Fortran_COMPILER_ID_VENDOR_FLAGS_NAG "-V")
   set(CMAKE_Fortran_COMPILER_ID_VENDOR_REGEX_NAG "NAG Fortran Compiler")
 
+  # Match the link line from xcodebuild output of the form
+  #  Ld ...
+  #      ...
+  #      /path/to/cc ...CompilerIdFortran/...
+  # to extract the compiler front-end for the language.
+  set(CMAKE_Fortran_COMPILER_ID_TOOL_MATCH_REGEX "\nLd[^\n]*(\n[ \t]+[^\n]*)*\n[ \t]+([^ \t\r\n]+)[^\r\n]*-o[^\r\n]*CompilerIdFortran/(\\./)?(CompilerIdFortran.xctest/)?CompilerIdFortran[ \t\n\\\"]")
+  set(CMAKE_Fortran_COMPILER_ID_TOOL_MATCH_INDEX 2)
+
   set(_version_info "")
   foreach(m MAJOR MINOR PATCH TWEAK)
     set(_COMP "_${m}")

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

Summary of changes:
 Modules/CMakeDetermineFortranCompiler.cmake |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake