[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3625-ge5484a4

[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  e5484a43278e4a45ded976c9884311028cf06100 (commit)
       via  bf5a5bc8b4788a236a53037c2f8a03904edf6079 (commit)
      from  bcb0a4b02550eef6fb774919f847d3121e7aabf6 (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=e5484a43278e4a45ded976c9884311028cf06100
commit e5484a43278e4a45ded976c9884311028cf06100
Merge: bcb0a4b bf5a5bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 2 16:02:15 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 2 16:02:15 2013 -0400

    Merge topic 'osx-find-sdk-for-deployment-target' into next
    
    bf5a5bc bootstrap: Do not suppress CMAKE_OSX_SYSROOT if CFLAGS have -isysroot (#14324)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf5a5bc8b4788a236a53037c2f8a03904edf6079
commit bf5a5bc8b4788a236a53037c2f8a03904edf6079
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 2 15:54:03 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 2 16:01:01 2013 -0400

    bootstrap: Do not suppress CMAKE_OSX_SYSROOT if CFLAGS have -isysroot (#14324)
    
    Revert commit a1c032b9 (bootstrap: Suppress CMAKE_OSX_SYSROOT if CFLAGS
    have -isysroot, 2012-09-21).  If MACOSX_DEPLOYMENT_TARGET is set then
    CMAKE_OSX_DEPLOYMENT_TARGET will be set and Darwin.cmake will complain
    if no CMAKE_OSX_SYSROOT is set.  Just allow both -isysroot flags to
    appear.  The one generated by CMAKE_OSX_SYSROOT appears after and
    overrides the one from CFLAGS/CXXFLAGS.

diff --git a/bootstrap b/bootstrap
index 281c3d0..afb66e5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1525,14 +1525,6 @@ set (CMAKE_MAN_DIR "'"${cmake_man_dir}"'" CACHE PATH "Install location for man p
 set (CMAKE_DATA_DIR "'"${cmake_data_dir}"'" CACHE PATH "Install location for data (relative to prefix)." FORCE)
 ' > "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
 
-# Suppress -isysroot if user-provided flags already have it.
-if echo "${cmake_c_flags}"   | grep isysroot >/dev/null 2>&1 &&
-   echo "${cmake_cxx_flags}" | grep isysroot >/dev/null 2>&1; then
-  echo '
-set(CMAKE_OSX_SYSROOT "" CACHE PATH "" FORCE)
-' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
-fi
-
 # Add configuration settings given as command-line options.
 if [ "x${cmake_bootstrap_qt_gui}" != "x" ]; then
   echo '

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

Summary of changes:
 bootstrap |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake