ENH: make sure Cygwin-Unknown is not the name for the package
This commit is contained in:
parent
afdc33dbb8
commit
92fce8d5a4
|
@ -32,7 +32,13 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
|
||||||
"${CPACK_SOURCE_PACKAGE_FILE_NAME}-RC-${CMake_VERSION_RC}")
|
"${CPACK_SOURCE_PACKAGE_FILE_NAME}-RC-${CMake_VERSION_RC}")
|
||||||
ENDIF(CMake_VERSION_RC)
|
ENDIF(CMake_VERSION_RC)
|
||||||
IF(NOT DEFINED CPACK_SYSTEM_NAME)
|
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)
|
ENDIF(NOT DEFINED CPACK_SYSTEM_NAME)
|
||||||
IF(${CPACK_SYSTEM_NAME} MATCHES Windows)
|
IF(${CPACK_SYSTEM_NAME} MATCHES Windows)
|
||||||
IF(CMAKE_CL_64)
|
IF(CMAKE_CL_64)
|
||||||
|
@ -52,6 +58,7 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
|
||||||
ENDIF(UNIX)
|
ENDIF(UNIX)
|
||||||
# cygwin specific packaging stuff
|
# cygwin specific packaging stuff
|
||||||
IF(CYGWIN)
|
IF(CYGWIN)
|
||||||
|
|
||||||
# if we are on cygwin and have cpack, then force the
|
# if we are on cygwin and have cpack, then force the
|
||||||
# doc, data and man dirs to conform to cygwin style directories
|
# doc, data and man dirs to conform to cygwin style directories
|
||||||
SET(CMAKE_DOC_DIR "/share/doc/${CPACK_PACKAGE_FILE_NAME}")
|
SET(CMAKE_DOC_DIR "/share/doc/${CPACK_PACKAGE_FILE_NAME}")
|
||||||
|
|
Loading…
Reference in New Issue