diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-05-23 11:47:43 -0400 |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-05-23 11:47:43 -0400 |
| commit | 6e0500878e6c2cf252e30f40f5d348579bdac5ee (patch) | |
| tree | 13aa89f2e6d45b87d40d92ee0d0acdd2d645cdb5 /CMakeCPack.cmake | |
| parent | 1427aa8391fe1a38ebd532487d1d87db0417ae9f (diff) | |
| download | cmake-6e0500878e6c2cf252e30f40f5d348579bdac5ee.tar.gz | |
ENH: do not put system name into cygwin package
Diffstat (limited to 'CMakeCPack.cmake')
| -rw-r--r-- | CMakeCPack.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake index ac6704981d..ec4cb9964f 100644 --- a/CMakeCPack.cmake +++ b/CMakeCPack.cmake @@ -48,7 +48,15 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") ENDIF(CMAKE_CL_64) 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}") + # if the CPACK_PACKAGE_FILE_NAME is not defined by the cache + # default to source package - system, on cygwin system is not + # needed + IF(CYGWIN) + SET(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}") + ELSE(CYGWIN) + SET(CPACK_PACKAGE_FILE_NAME + "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${CPACK_SYSTEM_NAME}") + ENDIF(CYGWIN) ENDIF(NOT DEFINED CPACK_PACKAGE_FILE_NAME) SET(CPACK_PACKAGE_CONTACT "cmake@cmake.org") IF(UNIX) |