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 1d9fe30505fe31863ac7ebc8bde633f096b44065 (commit)
via 15f5764e2ca9cd10fca7f5bb44f631c7c449352e (commit)
from 401af319ccb44e8e870c5ee1f70ec34452667bb0 (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=1d9fe30505fe31863ac7ebc8bde633f096b44065
commit 1d9fe30505fe31863ac7ebc8bde633f096b44065
Merge: 401af31 15f5764
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 5 10:55:41 2012 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Nov 5 10:55:41 2012 -0500
Merge topic 'osx-sysroot-cleanup' into next
15f5764 OS X: Fix default CMAKE_OSX_SYSROOT with deployment target
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15f5764e2ca9cd10fca7f5bb44f631c7c449352e
commit 15f5764e2ca9cd10fca7f5bb44f631c7c449352e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 5 10:43:46 2012 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 5 10:47:33 2012 -0500
OS X: Fix default CMAKE_OSX_SYSROOT with deployment target
Since commit 43b74793 (OS X: Further improve default CMAKE_OSX_SYSROOT
selection, 2012-09-21) we choose a default CMAKE_OSX_SYSROOT only when
one is needed. However, the change forgot that we require a sysroot
when a deployment target is requested. Teach Darwin.cmake to choose a
default CMAKE_OSX_SYSROOT when CMAKE_OSX_DEPLOYMENT_TARGET is set.
Reported-by: Matthew Brett <matthew.br...@gmail.com>
Reported-by: Bradley Giesbrecht <pixi...@macports.org>
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index a401762..4e7e99c 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -107,6 +107,7 @@ elseif(NOT "x$ENV{SDKROOT}" STREQUAL "x" AND
# Use the value of SDKROOT from the environment.
set(_CMAKE_OSX_SYSROOT_DEFAULT "$ENV{SDKROOT}")
elseif("${CMAKE_GENERATOR}" MATCHES Xcode
+ OR CMAKE_OSX_DEPLOYMENT_TARGET
OR CMAKE_OSX_ARCHITECTURES MATCHES "[^;]"
OR NOT EXISTS "/usr/include/sys/types.h")
# Find installed SDKs in either Xcode-4.3+ or pre-4.3 SDKs directory.
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Darwin.cmake | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
