[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-490-gc75a21e

[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  c75a21e18747dd824d0d5303b0e8c75ad09dd631 (commit)
       via  24aafbde115647b7e599d112d0bcc4f03c3e9b88 (commit)
      from  903a1bcdac07460526f3e175af3e66c32e1f23a6 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c75a21e18747dd824d0d5303b0e8c75ad09dd631
commit c75a21e18747dd824d0d5303b0e8c75ad09dd631
Merge: 903a1bc 24aafbd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 12 15:49:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 12 15:49:03 2015 -0400

    Merge topic 'xcode-adjust-deployment-to-host-version' into next
    
    24aafbde Xcode: Adjust deployment target SDK version to host version


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24aafbde115647b7e599d112d0bcc4f03c3e9b88
commit 24aafbde115647b7e599d112d0bcc4f03c3e9b88
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Oct 11 12:07:25 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 12 15:31:10 2015 -0400

    Xcode: Adjust deployment target SDK version to host version
    
    If the automatically selected SDK is newer than the host OS version
    and no deployment version has been set then adjust the deployment
    version to the host OS version. Otherwise the user won't be able to
    launch the executables on the build host.
    
    This is for example a problem on a MacOSX 10.10 host with Xcode 7
    which only provides a MacOSX10.11 SDK.

diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake
index 62fb985..a08411b 100644
--- a/Modules/Platform/Darwin-Initialize.cmake
+++ b/Modules/Platform/Darwin-Initialize.cmake
@@ -100,6 +100,10 @@ elseif("${CMAKE_GENERATOR}" MATCHES Xcode
         "Instead using SDK:\n \"${_CMAKE_OSX_SYSROOT_DEFAULT}\"."
         )
     endif()
+    if(NOT CMAKE_OSX_DEPLOYMENT_TARGET AND _CURRENT_OSX_VERSION VERSION_LESS _CMAKE_OSX_DEPLOYMENT_TARGET)
+      set(CMAKE_OSX_DEPLOYMENT_TARGET ${_CURRENT_OSX_VERSION} CACHE STRING
+        "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value." FORCE)
+    endif()
   else()
     # Assume developer files are in root (such as Xcode 4.5 command-line tools).
     set(_CMAKE_OSX_SYSROOT_DEFAULT "")

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

Summary of changes:
 Modules/Platform/Darwin-Initialize.cmake |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake