[Cmake-commits] CMake branch, master, updated. v3.9.3-932-gc3877b8

[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  c3877b892a79c37d5b39f2c6e7269906ce536191 (commit)
       via  45e30d128cc96edce96c499a1d6a201d4442d05f (commit)
       via  0be0e02cfba547733d710118ebbd74e61f1fce42 (commit)
      from  e2a57a438d25e45e117493b8d95396040fe39252 (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=c3877b892a79c37d5b39f2c6e7269906ce536191
commit c3877b892a79c37d5b39f2c6e7269906ce536191
Merge: e2a57a4 45e30d1
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Sun Sep 24 12:02:53 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun Sep 24 08:02:57 2017 -0400

    Merge topic '`16839-better-tvos-support`'
    
    45e30d12 Xcode: Add team to compiler-id project
    0be0e02c Xcode: Add tvOS and watchOS toolchain file support
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1278


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45e30d128cc96edce96c499a1d6a201d4442d05f
commit 45e30d128cc96edce96c499a1d6a201d4442d05f
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Sep 17 18:35:29 2017 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Tue Sep 19 20:44:31 2017 +0200

    Xcode: Add team to compiler-id project
    
    Closes #16839

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 9988a10..cddc966 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -328,6 +328,12 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
     else()
       set(id_sdkroot "")
     endif()
+    if(CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM)
+      set(id_development_team
+        "DEVELOPMENT_TEAM = \"${CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM}\";")
+    else()
+      set(id_development_team "")
+    endif()
     configure_file(${CMAKE_ROOT}/Modules/CompilerId/Xcode-3.pbxproj.in
       ${id_dir}/CompilerId${lang}.xcodeproj/project.pbxproj @ONLY)
     unset(_ENV_MACOSX_DEPLOYMENT_TARGET)
diff --git a/Modules/CompilerId/Xcode-3.pbxproj.in b/Modules/CompilerId/Xcode-3.pbxproj.in
index 84f48ae..1cbaa57 100644
--- a/Modules/CompilerId/Xcode-3.pbxproj.in
+++ b/Modules/CompilerId/Xcode-3.pbxproj.in
@@ -72,6 +72,7 @@
 		1DEB928608733DD80010E9CD = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				@id_development_team@
 				PRODUCT_NAME = CompilerId at id_lang@;
 			};
 			name = Debug;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0be0e02cfba547733d710118ebbd74e61f1fce42
commit 0be0e02cfba547733d710118ebbd74e61f1fce42
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Sep 17 18:03:42 2017 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Tue Sep 19 20:44:31 2017 +0200

    Xcode: Add tvOS and watchOS toolchain file support
    
    Issue #16839

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 0a93e5f..9988a10 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -321,7 +321,8 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
     set(id_product_type "com.apple.product-type.tool")
     if(CMAKE_OSX_SYSROOT)
       set(id_sdkroot "SDKROOT = \"${CMAKE_OSX_SYSROOT}\";")
-      if(CMAKE_OSX_SYSROOT MATCHES "(^|/)[Ii][Pp][Hh][Oo][Nn][Ee]")
+      if(CMAKE_OSX_SYSROOT MATCHES "(^|/)[Ii][Pp][Hh][Oo][Nn][Ee]" OR
+        CMAKE_OSX_SYSROOT MATCHES "(^|/)[Aa][Pp][Pp][Ll][Ee][Tt][Vv]")
         set(id_product_type "com.apple.product-type.bundle.unit-test")
       endif()
     else()

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

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |    9 ++++++++-
 Modules/CompilerId/Xcode-3.pbxproj.in  |    1 +
 2 files changed, 9 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake