[Cmake-commits] CMake branch, next, updated. v2.8.9-709-g4a07a0e

[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  4a07a0e51a8d3890da39ace8959e1389a28277f7 (commit)
       via  df928646bae077d0b827116f93a64062e8bd1731 (commit)
      from  2a327bd34fa9052be435f5ca105d510adcc416c2 (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=4a07a0e51a8d3890da39ace8959e1389a28277f7
commit 4a07a0e51a8d3890da39ace8959e1389a28277f7
Merge: 2a327bd df92864
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 24 14:46:37 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 24 14:46:37 2012 -0400

    Merge topic 'osx-sysroot-cleanup' into next
    
    df92864 OS X: Ignore MACOSX_DEPLOYMENT_TARGET during Xcode compiler id


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df928646bae077d0b827116f93a64062e8bd1731
commit df928646bae077d0b827116f93a64062e8bd1731
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 24 14:44:07 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 24 14:44:07 2012 -0400

    OS X: Ignore MACOSX_DEPLOYMENT_TARGET during Xcode compiler id
    
    Xcode honors this environment variable if the project file does not set
    it.  Hide it from Xcode while building the compiler id project.

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 8e38399..906a5e7 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -185,12 +185,20 @@ Id flags: ${testflags}
     endif()
     configure_file(${CMAKE_ROOT}/Modules/CompilerId/Xcode-${v}.pbxproj.in
       ${id_dir}/CompilerId${lang}.${ext}/project.pbxproj @ONLY IMMEDIATE)
+    unset(_ENV_MACOSX_DEPLOYMENT_TARGET)
+    if(DEFINED ENV{MACOSX_DEPLOYMENT_TARGET})
+      set(_ENV_MACOSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}")
+      set(ENV{MACOSX_DEPLOYMENT_TARGET} "")
+    endif()
     execute_process(COMMAND xcodebuild
       WORKING_DIRECTORY ${CMAKE_${lang}_COMPILER_ID_DIR}
       OUTPUT_VARIABLE CMAKE_${lang}_COMPILER_ID_OUTPUT
       ERROR_VARIABLE CMAKE_${lang}_COMPILER_ID_OUTPUT
       RESULT_VARIABLE CMAKE_${lang}_COMPILER_ID_RESULT
       )
+    if(DEFINED _ENV_MACOSX_DEPLOYMENT_TARGET)
+      set(ENV{MACOSX_DEPLOYMENT_TARGET} "${_ENV_MACOSX_DEPLOYMENT_TARGET}")
+    endif()
 
     # Match the link line from xcodebuild output of the form
     #  Ld ...

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

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake