[Cmake-commits] [cmake-commits] david.cole committed CPack.cmake 1.37 1.38

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv6761/Modules

Modified Files:
	CPack.cmake 
Log Message:
ENH: Apply patch for feature request #7170. Thanks to Tim Shead for contributing...


Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.37
retrieving revision 1.38
diff -C 2 -d -r1.37 -r1.38
*** CPack.cmake	17 Apr 2008 21:23:21 -0000	1.37
--- CPack.cmake	18 Jun 2008 13:53:26 -0000	1.38
***************
*** 115,118 ****
--- 115,119 ----
      else(CYGWIN)
        if(APPLE)
+         option(CPACK_BINARY_BUNDLE       "Enable to build OSX bundles"      OFF)
          option(CPACK_BINARY_PACKAGEMAKER "Enable to build PackageMaker packages" ON)
          option(CPACK_BINARY_OSXX11       "Enable to build OSX X11 packages"      OFF)
***************
*** 132,135 ****
--- 133,137 ----
    endif(UNIX)
    
+   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_BUNDLE       Bundle)
    cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_PACKAGEMAKER PackageMaker)
    cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_OSXX11       OSXX11)
***************
*** 172,176 ****
                   CPACK_BINARY_STGZ   CPACK_BINARY_TGZ          CPACK_BINARY_TBZ2 
                   CPACK_BINARY_DEB    CPACK_BINARY_RPM          CPACK_BINARY_TZ     
!                  CPACK_BINARY_NSIS CPACK_BINARY_ZIP 
                   CPACK_SOURCE_CYGWIN CPACK_SOURCE_TBZ2 CPACK_SOURCE_TGZ 
                   CPACK_SOURCE_TZ CPACK_SOURCE_ZIP)
--- 174,178 ----
                   CPACK_BINARY_STGZ   CPACK_BINARY_TGZ          CPACK_BINARY_TBZ2 
                   CPACK_BINARY_DEB    CPACK_BINARY_RPM          CPACK_BINARY_TZ     
!                  CPACK_BINARY_NSIS CPACK_BINARY_ZIP CPACK_BINARY_BUNDLE
                   CPACK_SOURCE_CYGWIN CPACK_SOURCE_TBZ2 CPACK_SOURCE_TGZ 
                   CPACK_SOURCE_TZ CPACK_SOURCE_ZIP)