summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-05-04 15:56:38 (GMT)
committerBrad King <brad.king@kitware.com>2010-05-04 15:56:38 (GMT)
commitc70fcf64aba77443bdb8bef3a62886c29a112df2 (patch)
treedcd7d11ea758ebd2d56d1b5976de1e4dd1007da9
parent0328379411386abc89ba07991f858cdacca926b2 (diff)
downloadCMake-c70fcf64aba77443bdb8bef3a62886c29a112df2.zip
CMake-c70fcf64aba77443bdb8bef3a62886c29a112df2.tar.gz
CMake-c70fcf64aba77443bdb8bef3a62886c29a112df2.tar.bz2
Package CMake with new version scheme
-rw-r--r--CMakeCPack.cmake9
1 files changed, 2 insertions, 7 deletions
diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
index 613bb9f..ce88d2f 100644
--- a/CMakeCPack.cmake
+++ b/CMakeCPack.cmake
@@ -31,12 +31,7 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
SET(CPACK_PACKAGE_VERSION_MINOR "${CMake_VERSION_MINOR}")
SET(CPACK_PACKAGE_VERSION_PATCH "${CMake_VERSION_PATCH}")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
- SET(CPACK_SOURCE_PACKAGE_FILE_NAME
- "cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
- IF(CMake_VERSION_RC)
- SET(CPACK_SOURCE_PACKAGE_FILE_NAME
- "${CPACK_SOURCE_PACKAGE_FILE_NAME}-rc${CMake_VERSION_RC}")
- ENDIF(CMake_VERSION_RC)
+ SET(CPACK_SOURCE_PACKAGE_FILE_NAME "cmake-${CMake_VERSION}")
IF(NOT DEFINED CPACK_SYSTEM_NAME)
# make sure package is not Cygwin-unknown, for Cygwin just
# cygwin is good for the system name
@@ -88,7 +83,7 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
SET(CPACK_PACKAGE_NAME cmake)
# setup the name of the package for cygwin cmake-2.4.3
SET(CPACK_PACKAGE_FILE_NAME
- "${CPACK_PACKAGE_NAME}-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
+ "${CPACK_PACKAGE_NAME}-${CMake_VERSION}")
# the source has the same name as the binary
SET(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME})
# Create a cygwin version number in case there are changes for cygwin