From 92fce8d5a4813cd6beb9aee725995a1ee794d896 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Tue, 20 May 2008 12:35:38 -0400 Subject: ENH: make sure Cygwin-Unknown is not the name for the package --- CMakeCPack.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake index 6532d9e..ac67049 100644 --- a/CMakeCPack.cmake +++ b/CMakeCPack.cmake @@ -32,7 +32,13 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") "${CPACK_SOURCE_PACKAGE_FILE_NAME}-RC-${CMake_VERSION_RC}") ENDIF(CMake_VERSION_RC) IF(NOT DEFINED CPACK_SYSTEM_NAME) - SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}) + # make sure package is not Cygwin-unknown, for Cygwin just + # cygwin is good for the system name + IF("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN") + SET(CPACK_SYSTEM_NAME Cygwin) + ELSE("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN") + SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}) + ENDIF("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN") ENDIF(NOT DEFINED CPACK_SYSTEM_NAME) IF(${CPACK_SYSTEM_NAME} MATCHES Windows) IF(CMAKE_CL_64) @@ -52,6 +58,7 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") ENDIF(UNIX) # cygwin specific packaging stuff IF(CYGWIN) + # if we are on cygwin and have cpack, then force the # doc, data and man dirs to conform to cygwin style directories SET(CMAKE_DOC_DIR "/share/doc/${CPACK_PACKAGE_FILE_NAME}") -- cgit v0.12