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 d3c45a83f489137874715c4a7d0c4f6f50a9cc13 (commit) via 32737a1de163185236e867e10a276e60334a0836 (commit) via e52e454f2cf9c8c6c9ab86afd4ce0c58df9e16ff (commit) via 098a18c476b5e60b3bacc0e47f23359fc4a3ea2c (commit) from 4b4bebc7e19687ff9d1d28374555e647e5b1a634 (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=d3c45a83f489137874715c4a7d0c4f6f50a9cc13 commit d3c45a83f489137874715c4a7d0c4f6f50a9cc13 Merge: 4b4bebc 32737a1 Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Mon Oct 31 07:25:11 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Oct 31 07:25:11 2016 -0400 Merge topic 'fix-macos-sysroot' into next 32737a1d Darwin: Remove deployment target version check e52e454f Revert "Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path" 098a18c4 CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32737a1de163185236e867e10a276e60334a0836 commit 32737a1de163185236e867e10a276e60334a0836 Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Mon Oct 31 10:29:44 2016 +0100 Commit: Gregor Jasny <gja...@googlemail.com> CommitDate: Mon Oct 31 12:24:20 2016 +0100 Darwin: Remove deployment target version check Querying the SDK version via xcodebuild -sdk <sysroot> -version Path gives bogus results for the Command Line Tools installed into /. Instead of adding another work-around I find it cleaner to remove the deployment target version check altogether. Resolves: http://public.kitware.com/pipermail/cmake-developers/2016-October/029539.html Resolves: #16323 diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake index 3606144..b539e45 100644 --- a/Modules/Platform/Darwin-Initialize.cmake +++ b/Modules/Platform/Darwin-Initialize.cmake @@ -113,7 +113,6 @@ set(CMAKE_OSX_SYSROOT "${_CMAKE_OSX_SYSROOT_DEFAULT}" CACHE ${_CMAKE_OSX_SYSROOT "The product will be built against the headers and libraries located inside the indicated SDK.") # Transform the cached value to something we can use. -set(_CMAKE_OSX_SYSROOT_ORIG "${CMAKE_OSX_SYSROOT}") set(_CMAKE_OSX_SYSROOT_PATH "") if(CMAKE_OSX_SYSROOT) if("x${CMAKE_OSX_SYSROOT}" MATCHES "/") @@ -122,7 +121,6 @@ if(CMAKE_OSX_SYSROOT) message(WARNING "Ignoring CMAKE_OSX_SYSROOT value:\n ${CMAKE_OSX_SYSROOT}\n" "because the directory does not exist.") set(CMAKE_OSX_SYSROOT "") - set(_CMAKE_OSX_SYSROOT_ORIG "") endif() set(_CMAKE_OSX_SYSROOT_PATH "${CMAKE_OSX_SYSROOT}") else() diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index c09bac4..727baa6 100644 --- a/Modules/Platform/Darwin.cmake +++ b/Modules/Platform/Darwin.cmake @@ -64,30 +64,6 @@ if(NOT DEFINED CMAKE_INSTALL_NAME_TOOL) mark_as_advanced(CMAKE_INSTALL_NAME_TOOL) endif() -# Make sure the combination of SDK and Deployment Target are allowed -if(CMAKE_OSX_DEPLOYMENT_TARGET) - if("${_CMAKE_OSX_SYSROOT_PATH}" MATCHES "/MacOSX([0-9]+\\.[0-9]+)[^/]*\\.sdk") - set(_sdk_ver "${CMAKE_MATCH_1}") - elseif("${_CMAKE_OSX_SYSROOT_ORIG}" MATCHES "^macosx([0-9]+\\.[0-9]+)$") - set(_sdk_ver "${CMAKE_MATCH_1}") - elseif("${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "/") - set(_sdk_ver "${_CURRENT_OSX_VERSION}") - else() - message(FATAL_ERROR - "CMAKE_OSX_DEPLOYMENT_TARGET is '${CMAKE_OSX_DEPLOYMENT_TARGET}' " - "but CMAKE_OSX_SYSROOT:\n \"${_CMAKE_OSX_SYSROOT_ORIG}\"\n" - "is not set to a MacOSX SDK with a recognized version. " - "Either set CMAKE_OSX_SYSROOT to a valid SDK or set " - "CMAKE_OSX_DEPLOYMENT_TARGET to empty.") - endif() - if(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER "${_sdk_ver}") - message(FATAL_ERROR - "CMAKE_OSX_DEPLOYMENT_TARGET (${CMAKE_OSX_DEPLOYMENT_TARGET}) " - "is greater than CMAKE_OSX_SYSROOT SDK:\n ${_CMAKE_OSX_SYSROOT_ORIG}\n" - "Please set CMAKE_OSX_DEPLOYMENT_TARGET to ${_sdk_ver} or lower.") - endif() -endif() - # Enable shared library versioning. set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-install_name") https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e52e454f2cf9c8c6c9ab86afd4ce0c58df9e16ff commit e52e454f2cf9c8c6c9ab86afd4ce0c58df9e16ff Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Mon Oct 31 10:25:38 2016 +0100 Commit: Gregor Jasny <gja...@googlemail.com> CommitDate: Mon Oct 31 10:25:38 2016 +0100 Revert "Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path" This reverts commit 540815eec2b83a8b43689580c54e8950d9f5868b. For a rationale see: http://public.kitware.com/pipermail/cmake-developers/2016-October/029539.html diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake index 39374e1..3606144 100644 --- a/Modules/Platform/Darwin-Initialize.cmake +++ b/Modules/Platform/Darwin-Initialize.cmake @@ -125,10 +125,8 @@ if(CMAKE_OSX_SYSROOT) set(_CMAKE_OSX_SYSROOT_ORIG "") endif() set(_CMAKE_OSX_SYSROOT_PATH "${CMAKE_OSX_SYSROOT}") - endif() - - if(CMAKE_OSX_SYSROOT) - # Transform the (maybe unversioned) sysroot into a versioned path. + else() + # Transform the sdk name into a path. execute_process( COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version Path OUTPUT_VARIABLE _stdout ----------------------------------------------------------------------- Summary of changes: Modules/Platform/Darwin-Initialize.cmake | 8 ++------ Modules/Platform/Darwin.cmake | 24 ------------------------ Source/CMakeVersion.cmake | 2 +- 3 files changed, 3 insertions(+), 31 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits