From 6e0500878e6c2cf252e30f40f5d348579bdac5ee Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Fri, 23 May 2008 11:47:43 -0400 Subject: ENH: do not put system name into cygwin package --- CMakeCPack.cmake | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'CMakeCPack.cmake') 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) -- cgit v1.2.1