summaryrefslogtreecommitdiffstats
path: root/CMakeCPack.cmake
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2008-05-20 16:35:38 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2008-05-20 16:35:38 (GMT)
commit92fce8d5a4813cd6beb9aee725995a1ee794d896 (patch)
tree6fa9e47fa6b10ca4dc2984cedec331e2a9b03e80 /CMakeCPack.cmake
parentafdc33dbb81fca97f39b0bc5c07f98a6b5b937bd (diff)
downloadCMake-92fce8d5a4813cd6beb9aee725995a1ee794d896.zip
CMake-92fce8d5a4813cd6beb9aee725995a1ee794d896.tar.gz
CMake-92fce8d5a4813cd6beb9aee725995a1ee794d896.tar.bz2
ENH: make sure Cygwin-Unknown is not the name for the package
Diffstat (limited to 'CMakeCPack.cmake')
-rw-r--r--CMakeCPack.cmake9
1 files changed, 8 insertions, 1 deletions
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}")