[Cmake-commits] CMake branch, next, updated. v3.0.0-4059-g3811d18

[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  3811d18a7e1e1a7a70ce5ec35bea55e9f3c5f00d (commit)
       via  591a7388cf8cd26377d901195c9946b51c44cdfb (commit)
      from  ba12dd176aecaedc288a9eefecb0d1adfce4b55e (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=3811d18a7e1e1a7a70ce5ec35bea55e9f3c5f00d
commit 3811d18a7e1e1a7a70ce5ec35bea55e9f3c5f00d
Merge: ba12dd1 591a738
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 2 09:41:19 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 2 09:41:19 2014 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=591a7388cf8cd26377d901195c9946b51c44cdfb
commit 591a7388cf8cd26377d901195c9946b51c44cdfb
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:42:22 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..dda28bd 100644
--- a/Modules/CMakeFindBinUtils.cmake
+++ b/Modules/CMakeFindBinUtils.cmake
@@ -66,9 +66,7 @@ else()
 
 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:


hooks/post-receive
-- 
CMake