[Cmake-commits] CMake branch, next, updated. v2.8.12-4757-gd411953

[Brad King]

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  d4119539cc87f52421f862937dcaf02699b6c052 (commit)
       via  7947981c2be1fe2eb71b09290a3f0e57d572a3f0 (commit)
      from  0ff6e579b977152c4a492135402c30fdc072f431 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4119539cc87f52421f862937dcaf02699b6c052
commit d4119539cc87f52421f862937dcaf02699b6c052
Merge: 0ff6e57 7947981
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 1 15:44:16 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 1 15:44:16 2013 -0400

    Merge topic 'osx-no-PackageMaker' into next
    
    7947981 CPack: Disable OS X PackageMaker by default (#13662)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7947981c2be1fe2eb71b09290a3f0e57d572a3f0
commit 7947981c2be1fe2eb71b09290a3f0e57d572a3f0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 1 15:36:26 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 1 15:41:16 2013 -0400

    CPack: Disable OS X PackageMaker by default (#13662)
    
    As mentioned in commit 4693cf84 (Xcode: Detect new default locations of
    Xcode 4.3 bits and pieces) PackageMaker was split out of Xcode 4.3 and
    above into a separate Auxiliary tools package.  Since Xcode 5.0 or so,
    Apple no longer distributes PackageMaker as part of the available
    development tools so it can only be obtained from old packages.
    
    Disable the CPACK_BINARY_PACKAGEMAKER option by default as is the case
    for most other tool-dependent generators.

diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index da6b2e0..fba5c47 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -416,7 +416,7 @@ if(NOT CPACK_GENERATOR)
       if(APPLE)
         option(CPACK_BINARY_BUNDLE       "Enable to build OSX bundles"      OFF)
         option(CPACK_BINARY_DRAGNDROP    "Enable to build OSX Drag And Drop package" OFF)
-        option(CPACK_BINARY_PACKAGEMAKER "Enable to build PackageMaker packages" ON)
+        option(CPACK_BINARY_PACKAGEMAKER "Enable to build PackageMaker packages" OFF)
         option(CPACK_BINARY_OSXX11       "Enable to build OSX X11 packages"      OFF)
       else()
         option(CPACK_BINARY_TZ  "Enable to build TZ packages"     ON)

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

Summary of changes:
 Modules/CPack.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake