[Cmake-commits] CMake branch, master, updated. v3.0.1-1827-gd11a195

[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, master has been updated
       via  d11a19528ea70092a522ec327d8f3e3d364db7b7 (commit)
       via  72d6681826840c0a14be61d19c71a55f280d38ae (commit)
      from  1251c1c8c50fccbd73b48cf8b13b3432845fc320 (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=d11a19528ea70092a522ec327d8f3e3d364db7b7
commit d11a19528ea70092a522ec327d8f3e3d364db7b7
Merge: 1251c1c 72d6681
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 8 12:57:01 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 8 12:57:01 2014 -0400

    Merge topic 'fix-clang-cross-compile-find-binutils'
    
    72d66818 Fix finding binutils when cross-compiling with Clang

diff --cc Modules/CMakeDetermineCCompiler.cmake
index 3847b75,2b8ecdc..6b425c6
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@@ -136,9 -136,11 +136,11 @@@ if (CMAKE_CROSSCOMPILING  AND NOT _CMAK
      if (COMPILER_BASENAME MATCHES "^(.+-)(clang|g?cc)(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$")
        set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
      elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
-       set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_C_COMPILER_TARGET}-)
+       if(CMAKE_C_COMPILER_TARGET)
+         set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_C_COMPILER_TARGET}-)
+       endif()
      elseif(COMPILER_BASENAME MATCHES "qcc(\\.exe)?$")
 -      if(CMAKE_C_COMPILER_TARGET MATCHES "gcc_nto([^_le]+)(le)?.*$")
 +      if(CMAKE_C_COMPILER_TARGET MATCHES "gcc_nto([^_le]+)(le)?")
          set(_CMAKE_TOOLCHAIN_PREFIX nto${CMAKE_MATCH_1}-)
        endif()
      endif ()
diff --cc Modules/CMakeDetermineCXXCompiler.cmake
index e6a9d9a,9af1de1..893c454
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@@ -133,9 -133,11 +133,11 @@@ if (CMAKE_CROSSCOMPILING  AND NOT  _CMA
      if (COMPILER_BASENAME MATCHES "^(.+-)(clan)?[gc]\\+\\+(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$")
        set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
      elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-       set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_CXX_COMPILER_TARGET}-)
+       if(CMAKE_CXX_COMPILER_TARGET)
+         set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_CXX_COMPILER_TARGET}-)
+       endif()
      elseif(COMPILER_BASENAME MATCHES "QCC(\\.exe)?$")
 -      if(CMAKE_CXX_COMPILER_TARGET MATCHES "gcc_nto([^_le]+)(le)?.*$")
 +      if(CMAKE_CXX_COMPILER_TARGET MATCHES "gcc_nto([^_le]+)(le)?")
          set(_CMAKE_TOOLCHAIN_PREFIX nto${CMAKE_MATCH_1}-)
        endif()
      endif ()

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

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


hooks/post-receive
-- 
CMake