[Cmake-commits] CMake branch, next, updated. v3.5.2-1586-g55b647a

Brad King brad.king at kitware.com
Thu May 26 09:23:52 EDT 2016


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  55b647a38dad9aa0d955fb438dd88cf7a4f3678a (commit)
       via  cffe0ed798d3ea7f5417d65ba52785105521aa53 (commit)
       via  0746a4c62cb0103ce56ed3729e85acd2d5f3037a (commit)
      from  d5f21f98666311bf7b1d71446ef1aa947d773fb0 (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=55b647a38dad9aa0d955fb438dd88cf7a4f3678a
commit 55b647a38dad9aa0d955fb438dd88cf7a4f3678a
Merge: d5f21f9 cffe0ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 26 09:23:51 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 26 09:23:51 2016 -0400

    Merge topic 'osx-no-warn-sdk-target-mismatch' into next
    
    cffe0ed7 OS X: Drop warning about SDK and deployment target version mismatch
    0746a4c6 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cffe0ed798d3ea7f5417d65ba52785105521aa53
commit cffe0ed798d3ea7f5417d65ba52785105521aa53
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 26 09:20:28 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 26 09:20:28 2016 -0400

    OS X: Drop warning about SDK and deployment target version mismatch
    
    OS X supports using the SDK for any version equal to or newer than
    the deployment target.  There is no reason to warn if the versions
    do not match exactly.
    
    Suggested-by: James Burgess <jamesrburgess at mac.com>
    Suggested-by: Clinton Stimpson <clinton at elemtech.com>

diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake
index a08411b..91c2cf3 100644
--- a/Modules/Platform/Darwin-Initialize.cmake
+++ b/Modules/Platform/Darwin-Initialize.cmake
@@ -90,16 +90,6 @@ elseif("${CMAKE_GENERATOR}" MATCHES Xcode
       endif()
     endforeach()
 
-    if(CMAKE_OSX_DEPLOYMENT_TARGET AND
-        NOT CMAKE_OSX_DEPLOYMENT_TARGET VERSION_EQUAL ${_CMAKE_OSX_DEPLOYMENT_TARGET})
-      set(_CMAKE_OSX_SDKS_VER ${CMAKE_OSX_DEPLOYMENT_TARGET}${_CMAKE_OSX_SDKS_VER_SUFFIX_${CMAKE_OSX_DEPLOYMENT_TARGET}})
-      set(_CMAKE_OSX_SYSROOT_CHECK "${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CMAKE_OSX_SDKS_VER}.sdk")
-      message(WARNING
-        "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' "
-        "but the matching SDK does not exist at:\n \"${_CMAKE_OSX_SYSROOT_CHECK}\"\n"
-        "Instead using SDK:\n \"${_CMAKE_OSX_SYSROOT_DEFAULT}\"."
-        )
-    endif()
     if(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)

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

Summary of changes:
 Modules/Platform/Darwin-Initialize.cmake |   10 ----------
 Source/CMakeVersion.cmake                |    2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list