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 d1bc55fd7228dd433eb457ec2d2dd38721694151 (commit)
via 540815eec2b83a8b43689580c54e8950d9f5868b (commit)
via 02277aef1081478192cc4669093665a01febc7ef (commit)
from 7ee381d0f5f46674cab4e9554236d6249010655d (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=d1bc55fd7228dd433eb457ec2d2dd38721694151
commit d1bc55fd7228dd433eb457ec2d2dd38721694151
Merge: 7ee381d 540815e
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Sun Sep 25 07:08:08 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Sep 25 07:08:08 2016 -0400
Merge topic 'xcode-sdk-version' into next
540815ee Xcode: Convert maybe unversioned OSX sysroot into versioned SDK
path
02277aef CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=540815eec2b83a8b43689580c54e8950d9f5868b
commit 540815eec2b83a8b43689580c54e8950d9f5868b
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Sun Sep 25 11:37:34 2016 +0200
Commit: Gregor Jasny <gja...@googlemail.com>
CommitDate: Sun Sep 25 13:06:23 2016 +0200
Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path
Starting with Xcode 8 the SDK folder also contains an unversioned
entry:
$ ls -l
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs
drwxr-xr-x 5 root wheel 170 Mar 4 2018 MacOSX.sdk
lrwxr-xr-x 1 root wheel 10 Sep 16 20:49 MacOSX10.12.sdk -> MacOSX.sdk
If this unversioned path is used CMake cannot detect the SDK
version. To work around the problem we always invoke the code path
that translates short SDK names like "macosx10.12" into a path.
That way we always end up with a versioned SDK path in
_CMAKE_OSX_SYSROOT_PATH which is later used to determine the version.
Closes: #16323
diff --git a/Modules/Platform/Darwin-Initialize.cmake
b/Modules/Platform/Darwin-Initialize.cmake
index 91c2cf3..427909d 100644
--- a/Modules/Platform/Darwin-Initialize.cmake
+++ b/Modules/Platform/Darwin-Initialize.cmake
@@ -125,8 +125,10 @@ if(CMAKE_OSX_SYSROOT)
set(_CMAKE_OSX_SYSROOT_ORIG "")
endif()
set(_CMAKE_OSX_SYSROOT_PATH "${CMAKE_OSX_SYSROOT}")
- else()
- # Transform the sdk name into a path.
+ endif()
+
+ if(CMAKE_OSX_SYSROOT)
+ # Transform the (maybe unversioned) sysroot into a versioned path.
execute_process(
COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version Path
OUTPUT_VARIABLE _stdout
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Darwin-Initialize.cmake | 6 ++++--
Source/CMakeVersion.cmake | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
