[Cmake-commits] [cmake-commits] hoffman committed CMakeCPack.cmake 1.11 1.12

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv14168

Modified Files:
	CMakeCPack.cmake 
Log Message:
ENH: make sure Cygwin-Unknown is not the name for the package


Index: CMakeCPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeCPack.cmake,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** CMakeCPack.cmake	9 Feb 2008 14:53:52 -0000	1.11
--- CMakeCPack.cmake	20 May 2008 16:35:38 -0000	1.12
***************
*** 33,37 ****
    ENDIF(CMake_VERSION_RC)
    IF(NOT DEFINED CPACK_SYSTEM_NAME)
!     SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
    ENDIF(NOT DEFINED CPACK_SYSTEM_NAME)
    IF(${CPACK_SYSTEM_NAME} MATCHES Windows)
--- 33,43 ----
    ENDIF(CMake_VERSION_RC)
    IF(NOT DEFINED CPACK_SYSTEM_NAME)
!     # 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)
***************
*** 53,56 ****
--- 59,63 ----
  # 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