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 54379cab91d6b2d6940d65fa8dd31530bd30ae52 (commit) via 25dbc485565649f54d64b57f6a35b651b8a15165 (commit) via 5ebba228823ffc96e82f4b6cc1103c2f2ed8cfa7 (commit) via ac5b80e76c102d43749555c9bc888f9ac9b7436e (commit) from 1ebf57341d671befa62b4065b7565a01f1fe06aa (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=54379cab91d6b2d6940d65fa8dd31530bd30ae52 commit 54379cab91d6b2d6940d65fa8dd31530bd30ae52 Merge: 1ebf573 25dbc48 Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Sun Oct 16 15:24:51 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sun Oct 16 15:24:51 2016 -0400 Merge topic '16355-osx-deployment-target-on-cross-compile' into next 25dbc485 Darwin: Do not try to set deployment target when crosscompiling (#16355) 5ebba228 CMake Nightly Date Stamp ac5b80e7 CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25dbc485565649f54d64b57f6a35b651b8a15165 commit 25dbc485565649f54d64b57f6a35b651b8a15165 Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Sun Oct 16 20:56:36 2016 +0200 Commit: Gregor Jasny <gja...@googlemail.com> CommitDate: Sun Oct 16 20:59:27 2016 +0200 Darwin: Do not try to set deployment target when crosscompiling (#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: Modules/Platform/Darwin-Initialize.cmake | 2 +- Source/CMakeVersion.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits