diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-05-10 13:15:08 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-05-10 13:15:08 (GMT) |
| commit | da8403a163358de3dab57fdd9a0cc3ec8fdf2b60 (patch) | |
| tree | 21adcdb99cf92a84d1ebdb0899262b8fe7b8bce5 | |
| parent | 3883b38b7ea9b004b6e75a10fce384d7675b1ff1 (diff) | |
| download | CMake-da8403a163358de3dab57fdd9a0cc3ec8fdf2b60.zip CMake-da8403a163358de3dab57fdd9a0cc3ec8fdf2b60.tar.gz CMake-da8403a163358de3dab57fdd9a0cc3ec8fdf2b60.tar.bz2 | |
ENH: allow for cpack stuff to be changed
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0442788..79ce768 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}") - SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}) - IF(${CMAKE_SYSTEM_NAME} MATCHES Windows) + IF(NOT DEFINED CPACK_SYSTEM_NAME) + SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}) + 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) - - - SET(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${CPACK_SYSTEM_NAME}") + 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. |