[Cmake-commits] [cmake-commits] hoffman committed CMakeCPack.cmake 1.12 1.13

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeCPack.cmake 
Log Message:
ENH: do not put system name into cygwin package


Index: CMakeCPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeCPack.cmake,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** CMakeCPack.cmake	20 May 2008 16:35:38 -0000	1.12
--- CMakeCPack.cmake	23 May 2008 15:47:43 -0000	1.13
***************
*** 49,53 ****
    ENDIF(${CPACK_SYSTEM_NAME} MATCHES Windows)
    IF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
!     SET(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${CPACK_SYSTEM_NAME}")
    ENDIF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
    SET(CPACK_PACKAGE_CONTACT "cmake at cmake.org")
--- 49,61 ----
    ENDIF(${CPACK_SYSTEM_NAME} MATCHES Windows)
    IF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
!     # if the CPACK_PACKAGE_FILE_NAME is not defined by the cache
!     # default to source package - system, on cygwin system is not 
!     # needed
!     IF(CYGWIN)
!       SET(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}")
!     ELSE(CYGWIN)
!       SET(CPACK_PACKAGE_FILE_NAME 
!         "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${CPACK_SYSTEM_NAME}")
!     ENDIF(CYGWIN)
    ENDIF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
    SET(CPACK_PACKAGE_CONTACT "cmake at cmake.org")