[Cmake-commits] CMake branch, next, updated. v3.0.0-4055-gfa6c373

[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  fa6c373f9e172e6592a2f3b7ecc28ea7c1e06042 (commit)
       via  b3012d206652854b49e154bf831f76d7d9942797 (commit)
      from  0440d7201686f779a477570b2bcdd8c25d9df7db (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=fa6c373f9e172e6592a2f3b7ecc28ea7c1e06042
commit fa6c373f9e172e6592a2f3b7ecc28ea7c1e06042
Merge: 0440d72 b3012d2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 2 09:17:15 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 2 09:17:15 2014 -0400

    Merge topic 'no-cross-install_name_tool' into next
    
    b3012d20 OS X: Only search for install_name_tool if the toolchain has it


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3012d206652854b49e154bf831f76d7d9942797
commit b3012d206652854b49e154bf831f76d7d9942797
Author:     Florent Castelli <orphis at spotify.com>
AuthorDate: Tue Jul 1 20:34:26 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 2 09:17:45 2014 -0400

    OS X: Only search for install_name_tool if the toolchain has it
    
    When cross compiling, toolchains won't have install_name_tool,
    which is provided by Xcode and command line tools on OS X.
    This is a Mach-O specific utility and not required on all platforms.

diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake
index 829b6ff..5b5bda8 100644
--- a/Modules/CMakeFindBinUtils.cmake
+++ b/Modules/CMakeFindBinUtils.cmake
@@ -68,7 +68,7 @@ endif()
 
 
 # on Apple there really should be install_name_tool
-if(APPLE)
+if(CMAKE_PLATFORM_HAS_INSTALLNAME)
   find_program(CMAKE_INSTALL_NAME_TOOL NAMES install_name_tool HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
 
   if(NOT CMAKE_INSTALL_NAME_TOOL)

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

Summary of changes:
 Modules/CMakeFindBinUtils.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake