[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-551-gf014b34

[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  f014b3408a942ed1be8e0bbe7767ec8e6f092f5f (commit)
       via  e8bafb6fcbb46bad4dfcb8dab1347c8e5f9a8090 (commit)
      from  a23f4f0666fdbfb7ab75635f62e216b5d5d158d0 (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=f014b3408a942ed1be8e0bbe7767ec8e6f092f5f
commit f014b3408a942ed1be8e0bbe7767ec8e6f092f5f
Merge: a23f4f0 e8bafb6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 17 10:05:06 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 17 10:05:06 2016 -0400

    Merge topic 'osx-no-deployment-target-on-cross-compile' into next
    
    e8bafb6f OS X: Do not try to set deployment target when cross-compiling


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8bafb6fcbb46bad4dfcb8dab1347c8e5f9a8090
commit e8bafb6fcbb46bad4dfcb8dab1347c8e5f9a8090
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Oct 16 20:56:36 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 17 10:02:17 2016 -0400

    OS X: Do not try to set deployment target when cross-compiling
    
    The change in commit v3.4.0-rc2~6^2 (Xcode: Adjust deployment target SDK
    version to host version, 2015-10-11) does not make sense when
    cross-compiling.  Make it conditional to fix this regression in some
    cross-compiling cases.
    
    Closes: #16355

diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake
index 427909d..39374e1 100644
--- a/Modules/Platform/Darwin-Initialize.cmake
+++ b/Modules/Platform/Darwin-Initialize.cmake
@@ -90,7 +90,7 @@ elseif("${CMAKE_GENERATOR}" MATCHES Xcode
       endif()
     endforeach()
 
-    if(NOT CMAKE_OSX_DEPLOYMENT_TARGET AND _CURRENT_OSX_VERSION VERSION_LESS _CMAKE_OSX_DEPLOYMENT_TARGET)
+    if(NOT CMAKE_CROSSCOMPILING AND 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()

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

Summary of changes:


hooks/post-receive
-- 
CMake