[Cmake-commits] [cmake-commits] alex committed CPack.cmake 1.36 1.37

[cmake-commits at cmake.org]

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

Modified Files:
	CPack.cmake 
Log Message:
ENH: use a common CPACK_BINARY_ prefix for the binary package generators

Alex


Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.36
retrieving revision 1.37
diff -C 2 -d -r1.36 -r1.37
*** CPack.cmake	27 Mar 2008 00:12:17 -0000	1.36
--- CPack.cmake	17 Apr 2008 21:23:21 -0000	1.37
***************
*** 112,146 ****
    if(UNIX)
      if(CYGWIN)
!       option(CPACK_CYGWIN_BINARY "Enable to build Cygwin binary packages" ON)
      else(CYGWIN)
        if(APPLE)
!         option(CPACK_PACKAGEMAKER "Enable to build PackageMaker packages" ON)
!         option(CPACK_OSXX11       "Enable to build OSX X11 packages"      OFF)
        else(APPLE)
!         option(CPACK_TZ  "Enable to build TZ packages"     ON)
        endif(APPLE)
!       option(CPACK_STGZ "Enable to build STGZ packages"    ON)
!       option(CPACK_TGZ  "Enable to build TGZ packages"     ON)
!       option(CPACK_TBZ2 "Enable to build TBZ2 packages"    ON)
!       option(CPACK_DEB  "Enable to build Debian packages"  OFF)
!       option(CPACK_RPM  "Enable to build RPM packages"     OFF)
!       option(CPACK_NSIS "Enable to build NSIS packages"    OFF)
      endif(CYGWIN)
    else(UNIX)
!     option(CPACK_NSIS "Enable to build NSIS packages" ON)
!     option(CPACK_ZIP  "Enable to build ZIP packages" ON)
    endif(UNIX)
    
!   cpack_optional_append(CPACK_GENERATOR  CPACK_PACKAGEMAKER   PackageMaker)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_OSXX11         OSXX11)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_CYGWIN_BINARY  CygwinBinary)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_DEB            DEB)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_RPM            RPM)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_NSIS           NSIS)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_STGZ           STGZ)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_TGZ            TGZ)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_TBZ2           TBZ2)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_TZ             TZ)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_ZIP            ZIP)
    
  endif(NOT CPACK_GENERATOR)
--- 112,146 ----
    if(UNIX)
      if(CYGWIN)
!       option(CPACK_BINARY_CYGWIN "Enable to build Cygwin binary packages" ON)
      else(CYGWIN)
        if(APPLE)
!         option(CPACK_BINARY_PACKAGEMAKER "Enable to build PackageMaker packages" ON)
!         option(CPACK_BINARY_OSXX11       "Enable to build OSX X11 packages"      OFF)
        else(APPLE)
!         option(CPACK_BINARY_TZ  "Enable to build TZ packages"     ON)
        endif(APPLE)
!       option(CPACK_BINARY_STGZ "Enable to build STGZ packages"    ON)
!       option(CPACK_BINARY_TGZ  "Enable to build TGZ packages"     ON)
!       option(CPACK_BINARY_TBZ2 "Enable to build TBZ2 packages"    ON)
!       option(CPACK_BINARY_DEB  "Enable to build Debian packages"  OFF)
!       option(CPACK_BINARY_RPM  "Enable to build RPM packages"     OFF)
!       option(CPACK_BINARY_NSIS "Enable to build NSIS packages"    OFF)
      endif(CYGWIN)
    else(UNIX)
!     option(CPACK_BINARY_NSIS "Enable to build NSIS packages" ON)
!     option(CPACK_BINARY_ZIP  "Enable to build ZIP packages" ON)
    endif(UNIX)
    
!   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_PACKAGEMAKER PackageMaker)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_OSXX11       OSXX11)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_CYGWIN       CygwinBinary)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_DEB          DEB)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_RPM          RPM)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_NSIS         NSIS)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_STGZ         STGZ)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_TGZ          TGZ)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_TBZ2         TBZ2)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_TZ           TZ)
!   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_ZIP          ZIP)
    
  endif(NOT CPACK_GENERATOR)
***************
*** 169,175 ****
  
  # mark the above options as advanced
! mark_as_advanced(CPACK_CYGWIN_BINARY CPACK_PACKAGEMAKER CPACK_OSXX11
!                  CPACK_STGZ CPACK_TGZ CPACK_TBZ2 CPACK_DEB CPACK_RPM 
!                  CPACK_TZ CPACK_NSIS CPACK_ZIP 
                   CPACK_SOURCE_CYGWIN CPACK_SOURCE_TBZ2 CPACK_SOURCE_TGZ 
                   CPACK_SOURCE_TZ CPACK_SOURCE_ZIP)
--- 169,176 ----
  
  # mark the above options as advanced
! mark_as_advanced(CPACK_BINARY_CYGWIN CPACK_BINARY_PACKAGEMAKER CPACK_BINARY_OSXX11
!                  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)