[Cmake-commits] CMake branch, master, updated. v3.6.2-1159-g63c2501

2016-09-25 Thread Kitware Robot 
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, master has been updated
   via  63c25013b143e1e945eeb35d419407fa1d4d24de (commit)
  from  02277aef1081478192cc4669093665a01febc7ef (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=63c25013b143e1e945eeb35d419407fa1d4d24de
commit 63c25013b143e1e945eeb35d419407fa1d4d24de
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Mon Sep 26 00:01:04 2016 -0400
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Sep 26 00:01:04 2016 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index faef86b..9a10ddb 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 6)
-set(CMake_VERSION_PATCH 20160925)
+set(CMake_VERSION_PATCH 20160926)
 #set(CMake_VERSION_RC 1)

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.6.2-2463-ge4d7820

2016-09-25 Thread Domen Vrankar 
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  e4d782024d3c654c216bbd32d6ad80f43dde5c29 (commit)
   via  3c63947c9d645a7b9763b116610cc2c58024f5ab (commit)
  from  d1bc55fd7228dd433eb457ec2d2dd38721694151 (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=e4d782024d3c654c216bbd32d6ad80f43dde5c29
commit e4d782024d3c654c216bbd32d6ad80f43dde5c29
Merge: d1bc55f 3c63947
Author: Domen Vrankar 
AuthorDate: Sun Sep 25 17:55:29 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Sep 25 17:55:29 2016 -0400

Merge topic 'cpack-rpm-debuginfo-sources' into next

3c63947c fixup! CPack/RPM debuginfo packages must contain sources


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c63947c9d645a7b9763b116610cc2c58024f5ab
commit 3c63947c9d645a7b9763b116610cc2c58024f5ab
Author: Domen Vrankar 
AuthorDate: Sun Sep 25 23:54:53 2016 +0200
Commit: Domen Vrankar 
CommitDate: Sun Sep 25 23:54:53 2016 +0200

fixup! CPack/RPM debuginfo packages must contain sources

diff --git a/Tests/RunCMake/CPack/DEBUGINFO.cmake 
b/Tests/RunCMake/CPack/DEBUGINFO.cmake
index e8d1c85..ead7ad1 100644
--- a/Tests/RunCMake/CPack/DEBUGINFO.cmake
+++ b/Tests/RunCMake/CPack/DEBUGINFO.cmake
@@ -1,11 +1,5 @@
 set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
 
-# PGI compiler doesn't add build id to binaries by default
-if(CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
-  string(APPEND CMAKE_EXE_LINKER_FLAGS "--build-id")
-  string(APPEND CMAKE_SHARED_LINKER_FLAGS "--build-id")
-endif()
-
 set(CPACK_RPM_COMPONENT_INSTALL "ON")
 
 set(CMAKE_BUILD_TYPE Debug)
diff --git a/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake 
b/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
new file mode 100644
index 000..fea8db5
--- /dev/null
+++ b/Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake
@@ -0,0 +1,8 @@
+function(get_test_prerequirements found_var)
+  # for now PGI compiler is not supported as it doesn't set --build-id
+  # required by debuginfo rpm packages
+
+  if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
+set(${found_var} true PARENT_SCOPE)
+  endif()
+endfunction()

---

Summary of changes:
 Tests/RunCMake/CPack/DEBUGINFO.cmake |6 --
 Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake |8 
 2 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 Tests/RunCMake/CPack/RPM/DEBUGINFO-Prerequirements.cmake


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.6.2-2461-gd1bc55f

2016-09-25 Thread Gregor Jasny via Cmake-commits 
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 
AuthorDate: Sun Sep 25 07:08:08 2016 -0400
Commit: CMake Topic Stage 
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 
AuthorDate: Sun Sep 25 11:37:34 2016 +0200
Commit: Gregor Jasny 
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