summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2008-03-27 00:12:17 (GMT)
committerAlexander Neundorf <neundorf@kde.org>2008-03-27 00:12:17 (GMT)
commit6502177306899f78b538bfb4ef62feee8fbb49eb (patch)
tree370fb1438ed892b8b12611946c490442452c4b01
parent43cad3e4a54542dce758e2c0f3ea4aef7356ac14 (diff)
downloadCMake-6502177306899f78b538bfb4ef62feee8fbb49eb.zip
CMake-6502177306899f78b538bfb4ef62feee8fbb49eb.tar.gz
CMake-6502177306899f78b538bfb4ef62feee8fbb49eb.tar.bz2
ENH: use CPACK_PACKAGE_VERSION instead of
CPACK_PACKAGE_VERSION_MAJOR.CPACK_PACKAGE_VERSION_MINOR.CPACK_PACKAGE_VERSION_PATCH for creating the package file name Alex
-rw-r--r--Modules/CPack.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index b0075ac..15f46fb 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -73,7 +73,7 @@ cpack_set_if_not_set(CPACK_SYSTEM_NAME "${__cpack_system_name}")
# <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_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}")
cpack_set_if_not_set(CPACK_PACKAGE_INSTALL_DIRECTORY
"${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}")
cpack_set_if_not_set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY
@@ -202,7 +202,7 @@ cpack_set_if_not_set(CPACK_SOURCE_INSTALLED_DIRECTORIES
"${CMAKE_SOURCE_DIR};/")
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_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Source")
cpack_set_if_not_set(CPACK_SOURCE_IGNORE_FILES
"/CVS/;/\\\\\\\\.svn/;\\\\\\\\.swp$;\\\\\\\\.#;/#")
SET(CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_SOURCE_INSTALL_CMAKE_PROJECTS}")