[Cmake-commits] CMake branch, next, updated. v2.8.9-689-g15a3d70
Brad King
brad.king at kitware.com
Fri Sep 21 14:49:14 EDT 2012
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 15a3d70fd097768783ac7d58cb5167d852c78f81 (commit)
via 43b74793de80153b9446689adf79c4acf1391969 (commit)
via 2690738458725f2c52afccd99ee744a9b92e30ed (commit)
via 7995722e919c66ff3aad7de73d489bf838af5426 (commit)
from d2ab62f12da624b0ca7f476a519d0db369a8b962 (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=15a3d70fd097768783ac7d58cb5167d852c78f81
commit 15a3d70fd097768783ac7d58cb5167d852c78f81
Merge: d2ab62f 43b7479
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 21 14:49:13 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 21 14:49:13 2012 -0400
Merge topic 'osx-sysroot-cleanup' into next
43b7479 OS X: Further improve default CMAKE_OSX_SYSROOT selection
2690738 OS X: If CMAKE_OSX_SYSROOT is already set do not compute default
7995722 OS X: Simplify selection of CMAKE_OSX_ARCHITECTURES
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43b74793de80153b9446689adf79c4acf1391969
commit 43b74793de80153b9446689adf79c4acf1391969
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 21 14:35:29 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 21 14:45:54 2012 -0400
OS X: Further improve default CMAKE_OSX_SYSROOT selection
Since commit 230ea218 (OS X: Improve default CMAKE_OSX_SYSROOT
selection, 2012-09-21) we always set CMAKE_OSX_SYSROOT if any SDK is
found in order to support Makefile generator builds with Xcode >= 4.3
without the command-line tools installed. However, in the basic
POSIX-only case of the Makefile generator with command-line tools and no
CMAKE_OSX_ARCHITECTURES we should not select any SDK by default.
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index 90d34ca..46ea310 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -106,7 +106,9 @@ elseif(NOT "x$ENV{SDKROOT}" STREQUAL "x" AND
(NOT "x$ENV{SDKROOT}" MATCHES "/" OR IS_DIRECTORY "$ENV{SDKROOT}"))
# Use the value of SDKROOT from the environment.
set(_CMAKE_OSX_SYSROOT_DEFAULT "$ENV{SDKROOT}")
-else()
+elseif("${CMAKE_GENERATOR}" MATCHES Xcode
+ 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.
set(_CMAKE_OSX_SDKS_DIR "")
if(OSX_DEVELOPER_ROOT)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2690738458725f2c52afccd99ee744a9b92e30ed
commit 2690738458725f2c52afccd99ee744a9b92e30ed
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 21 14:25:25 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 21 14:45:54 2012 -0400
OS X: If CMAKE_OSX_SYSROOT is already set do not compute default
The default computation logic is non-trivial. Do not bother with it if
the value is already known.
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index f592085..90d34ca 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -99,10 +99,12 @@ endif()
#----------------------------------------------------------------------------
# CMAKE_OSX_SYSROOT
-# Environment variable set by the user overrides our default.
-# Use the same environment variable that Xcode uses.
-if(NOT "x$ENV{SDKROOT}" STREQUAL "x" AND
- (NOT "x$ENV{SDKROOT}" MATCHES "/" OR IS_DIRECTORY "$ENV{SDKROOT}"))
+if(CMAKE_OSX_SYSROOT)
+ # Use the existing value without further computation to choose a default.
+ set(_CMAKE_OSX_SYSROOT_DEFAULT "${CMAKE_OSX_SYSROOT}")
+elseif(NOT "x$ENV{SDKROOT}" STREQUAL "x" AND
+ (NOT "x$ENV{SDKROOT}" MATCHES "/" OR IS_DIRECTORY "$ENV{SDKROOT}"))
+ # Use the value of SDKROOT from the environment.
set(_CMAKE_OSX_SYSROOT_DEFAULT "$ENV{SDKROOT}")
else()
# Find installed SDKs in either Xcode-4.3+ or pre-4.3 SDKs directory.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7995722e919c66ff3aad7de73d489bf838af5426
commit 7995722e919c66ff3aad7de73d489bf838af5426
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 21 14:13:06 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 21 14:45:53 2012 -0400
OS X: Simplify selection of CMAKE_OSX_ARCHITECTURES
Incremental changes to the logic over time have led to simply
initializing the cache entry with the environment value.
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index 56f340d..f592085 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -77,6 +77,10 @@ execute_process(COMMAND sw_vers -productVersion
OUTPUT_VARIABLE CURRENT_OSX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
+# Save CMAKE_OSX_ARCHITECTURES from the environment.
+set(CMAKE_OSX_ARCHITECTURES "$ENV{CMAKE_OSX_ARCHITECTURES}" CACHE STRING
+ "Build architectures for OSX")
+
#----------------------------------------------------------------------------
# _CURRENT_OSX_VERSION - as a two-component string: 10.5, 10.6, ...
#
@@ -183,29 +187,6 @@ endfunction()
# Make sure the combination of SDK and Deployment Target are allowed
SanityCheckSDKAndDeployTarget("${CMAKE_OSX_SYSROOT}" "${CMAKE_OSX_DEPLOYMENT_TARGET}")
-# set _CMAKE_OSX_MACHINE to uname -m
-execute_process(COMMAND uname -m
- OUTPUT_STRIP_TRAILING_WHITESPACE
- OUTPUT_VARIABLE _CMAKE_OSX_MACHINE)
-
-# check for Power PC and change to ppc
-if(_CMAKE_OSX_MACHINE MATCHES "Power")
- set(_CMAKE_OSX_MACHINE ppc)
-endif()
-
-# check for environment variable CMAKE_OSX_ARCHITECTURES
-# if it is set.
-if(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
- set(CMAKE_OSX_ARCHITECTURES_VALUE "$ENV{CMAKE_OSX_ARCHITECTURES}")
-else()
- set(CMAKE_OSX_ARCHITECTURES_VALUE "")
-endif()
-
-# now put _CMAKE_OSX_MACHINE into the cache
-set(CMAKE_OSX_ARCHITECTURES ${CMAKE_OSX_ARCHITECTURES_VALUE} CACHE STRING
- "Build architectures for OSX")
-
-
if("${CMAKE_BACKWARDS_COMPATIBILITY}" MATCHES "^1\\.[0-6]$")
set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS
"${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -flat_namespace -undefined suppress")
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Darwin.cmake | 41 +++++++++++++----------------------------
1 files changed, 13 insertions(+), 28 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list