summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2006-05-10 13:28:22 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2006-05-10 13:28:22 (GMT)
commitec4fbc338c6f5ed25700cd453326f90cc1313f39 (patch)
treedb1756aa97dd6ec997242e71d36b820a26e1eee2 /CMakeLists.txt
parentfac986ae9de64c20277a7fd884bad95b465469fe (diff)
downloadCMake-ec4fbc338c6f5ed25700cd453326f90cc1313f39.zip
CMake-ec4fbc338c6f5ed25700cd453326f90cc1313f39.tar.gz
CMake-ec4fbc338c6f5ed25700cd453326f90cc1313f39.tar.bz2
ENH: allow package name to be changed from cmake cache
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 716546b..7e37e0d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -246,17 +246,19 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
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(NOT DEFINED CPACK_SYSTEM_NAME)
SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
- IF(${CMAKE_SYSTEM_NAME} MATCHES Windows)
+ ENDIF(NOT DEFINED CPACK_SYSTEM_NAME)
+ IF(${CPACK_SYSTEM_NAME} MATCHES Windows)
IF(CMAKE_CL_64)
SET(CPACK_SYSTEM_NAME win64)
ELSE(CMAKE_CL_64)
SET(CPACK_SYSTEM_NAME win32)
ENDIF(CMAKE_CL_64)
- ENDIF(${CMAKE_SYSTEM_NAME} MATCHES Windows)
-
-
+ 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)
IF(WIN32 AND NOT UNIX)
# There is a bug in NSI that does not handle full unix paths properly. Make
# sure there is at least one set of four (4) backlasshes.