[Cmake-commits] [cmake-commits] hoffman committed CPack.cmake 1.35 1.35.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CPack.cmake 
Log Message:
ENH: merge in from main tree


Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -C 2 -d -r1.35 -r1.35.2.1
*** CPack.cmake	26 Dec 2007 21:57:13 -0000	1.35
--- CPack.cmake	27 Mar 2008 15:16:30 -0000	1.35.2.1
***************
*** 74,78 ****
  # <project>-<major>.<minor>.<patch>-<release>-<platform>.<pkgtype>
  cpack_set_if_not_set(CPACK_PACKAGE_FILE_NAME
!   "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${CPACK_SYSTEM_NAME}")
  cpack_set_if_not_set(CPACK_PACKAGE_INSTALL_DIRECTORY
    "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}")
--- 74,78 ----
  # <project>-<major>.<minor>.<patch>-<release>-<platform>.<pkgtype>
  cpack_set_if_not_set(CPACK_PACKAGE_FILE_NAME
!   "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}")
  cpack_set_if_not_set(CPACK_PACKAGE_INSTALL_DIRECTORY
    "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}")
***************
*** 203,207 ****
  cpack_set_if_not_set(CPACK_SOURCE_TOPLEVEL_TAG "${CPACK_SYSTEM_NAME}-Source")
  cpack_set_if_not_set(CPACK_SOURCE_PACKAGE_FILE_NAME
!   "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-Source")
  cpack_set_if_not_set(CPACK_SOURCE_IGNORE_FILES
    "/CVS/;/\\\\\\\\.svn/;\\\\\\\\.swp$;\\\\\\\\.#;/#")
--- 203,207 ----
  cpack_set_if_not_set(CPACK_SOURCE_TOPLEVEL_TAG "${CPACK_SYSTEM_NAME}-Source")
  cpack_set_if_not_set(CPACK_SOURCE_PACKAGE_FILE_NAME
!   "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Source")
  cpack_set_if_not_set(CPACK_SOURCE_IGNORE_FILES
    "/CVS/;/\\\\\\\\.svn/;\\\\\\\\.swp$;\\\\\\\\.#;/#")