[Cmake-commits] CMake branch, next, updated. v3.5.2-852-g328b91e

[Clinton Stimpson]

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  328b91e76b5ac6cfc45ca601e6cd03c216a7df9e (commit)
       via  e2d3d7558cbeb3db7e48bbb9c9dda1f503622b34 (commit)
      from  aac033f37386fbb263279cbe76349d69697b671d (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=328b91e76b5ac6cfc45ca601e6cd03c216a7df9e
commit 328b91e76b5ac6cfc45ca601e6cd03c216a7df9e
Merge: aac033f e2d3d75
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Jun 2 14:55:24 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 2 14:55:24 2016 -0400

    Merge topic 'productbuild' into next
    
    e2d3d755 productbuild: only enable productbuild tests on new enough Xcode


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2d3d7558cbeb3db7e48bbb9c9dda1f503622b34
commit e2d3d7558cbeb3db7e48bbb9c9dda1f503622b34
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Jun 2 12:55:04 2016 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Jun 2 12:55:04 2016 -0600

    productbuild: only enable productbuild tests on new enough Xcode

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 63d494f..bffa4b7 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -951,8 +951,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     set(CPackComponents_BUILD_OPTIONS)
     if(APPLE)
       set(CPackComponents_BUILD_OPTIONS -DCPACK_BINARY_DRAGNDROP:BOOL=ON)
-      set(CPackComponents_BUILD_OPTIONS ${CPackComponents_BUILD_OPTIONS}
-        -DCPACK_BINARY_PRODUCTBUILD:BOOL=ON)
+      if(CMake_TEST_XCODE_VERSION VERSION_GREATER "4.6")
+        set(CPackComponents_BUILD_OPTIONS ${CPackComponents_BUILD_OPTIONS}
+          -DCPACK_BINARY_PRODUCTBUILD:BOOL=ON)
+      endif()
     endif()
     if(NSIS_MAKENSIS_EXECUTABLE)
       set(CPackComponents_BUILD_OPTIONS ${CPackComponents_BUILD_OPTIONS}
@@ -997,7 +999,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     list(APPEND ACTIVE_CPACK_GENERATORS "ZIP")
     if(APPLE)
       list(APPEND ACTIVE_CPACK_GENERATORS "DragNDrop")
-      list(APPEND ACTIVE_CPACK_GENERATORS "productbuild")
+      if(CMake_TEST_XCODE_VERSION VERSION_GREATER "4.6")
+        list(APPEND ACTIVE_CPACK_GENERATORS "productbuild")
+      endif()
     endif()
 
     # set up list of component packaging ways
@@ -1108,8 +1112,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     set(CPackComponents_BUILD_OPTIONS)
     if(APPLE)
       set(CPackComponents_BUILD_OPTIONS -DCPACK_BINARY_DRAGNDROP:BOOL=ON)
-      set(CPackComponents_BUILD_OPTIONS ${CPackComponents_BUILD_OPTIONS}
-        -DCPACK_BINARY_PRODUCTBUILD:BOOL=ON)
+      if(CMake_TEST_XCODE_VERSION VERSION_GREATER "4.6")
+        set(CPackComponents_BUILD_OPTIONS ${CPackComponents_BUILD_OPTIONS}
+          -DCPACK_BINARY_PRODUCTBUILD:BOOL=ON)
+      endif()
     endif()
     if(NOT NSIS_MAKENSIS_EXECUTABLE)
       set(CPackComponents_BUILD_OPTIONS ${CPackComponents_BUILD_OPTIONS}

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

Summary of changes:
 Tests/CMakeLists.txt |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake