[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2300-g88f450e

[Rolf Eike Beer]

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  88f450ed1964df6c98e69048af7d0a074abf0ab2 (commit)
       via  f1e8019944a6ba089f7bb427b5ab969b5099de9b (commit)
      from  3d607aeed2d53775f7fa096374257cc8a8d021b0 (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=88f450ed1964df6c98e69048af7d0a074abf0ab2
commit 88f450ed1964df6c98e69048af7d0a074abf0ab2
Merge: 3d607ae f1e8019
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Apr 14 12:15:34 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 14 12:15:34 2014 -0400

    Merge topic 'matches-cleanup' into next
    
    f1e80199 Revert "hunt down more place where a wildcard was used at the begin of a MATCHES regex"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1e8019944a6ba089f7bb427b5ab969b5099de9b
commit f1e8019944a6ba089f7bb427b5ab969b5099de9b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Apr 14 18:14:55 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Apr 14 18:14:55 2014 +0200

    Revert "hunt down more place where a wildcard was used at the begin of a MATCHES regex"
    
    This reverts commit d0560bdd512fd7647dcd80f7ebe23f5d3fa4b957.
    
    This was wrong, the first pattern was actually used.

diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake
index 934903a..3847b75 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -151,7 +151,7 @@ if (CMAKE_CROSSCOMPILING  AND NOT _CMAKE_TOOLCHAIN_PREFIX)
   elseif("${CMAKE_C_COMPILER_ID}" MATCHES "TI")
     # TI compilers are named e.g. cl6x, cl470 or armcl.exe
     get_filename_component(COMPILER_BASENAME "${CMAKE_C_COMPILER}" NAME)
-    if (COMPILER_BASENAME MATCHES "cl([^.]+)?(\\.exe)?$")
+    if (COMPILER_BASENAME MATCHES "^(.+)?cl([^.]+)?(\\.exe)?$")
       set(_CMAKE_TOOLCHAIN_PREFIX "${CMAKE_MATCH_1}")
       set(_CMAKE_TOOLCHAIN_SUFFIX "${CMAKE_MATCH_2}")
     endif ()
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake
index aba35d0..e6a9d9a 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -148,7 +148,7 @@ if (CMAKE_CROSSCOMPILING  AND NOT  _CMAKE_TOOLCHAIN_PREFIX)
   elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "TI")
     # TI compilers are named e.g. cl6x, cl470 or armcl.exe
     get_filename_component(COMPILER_BASENAME "${CMAKE_CXX_COMPILER}" NAME)
-    if (COMPILER_BASENAME MATCHES "cl([^.]+)?(\\.exe)?$")
+    if (COMPILER_BASENAME MATCHES "^(.+)?cl([^.]+)?(\\.exe)?$")
       set(_CMAKE_TOOLCHAIN_PREFIX "${CMAKE_MATCH_1}")
       set(_CMAKE_TOOLCHAIN_SUFFIX "${CMAKE_MATCH_2}")
     endif ()

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

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


hooks/post-receive
-- 
CMake