[Cmake-commits] [cmake-commits] king committed CPack.cmake 1.45.2.1 1.45.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-8
	CPack.cmake 
Log Message:
CMake 2.8.0


Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.45.2.1
retrieving revision 1.45.2.2
diff -C 2 -d -r1.45.2.1 -r1.45.2.2
*** CPack.cmake	1 Oct 2009 21:20:22 -0000	1.45.2.1
--- CPack.cmake	13 Nov 2009 14:07:10 -0000	1.45.2.2
***************
*** 794,800 ****
  cpack_set_if_not_set(CPACK_CMAKE_GENERATOR "${CMAKE_GENERATOR}")
  cpack_set_if_not_set(CPACK_TOPLEVEL_TAG "${CPACK_SYSTEM_NAME}")
! 
  cpack_set_if_not_set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
! cpack_set_if_not_set(CPACK_NSIS_PACKAGE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
  
  cpack_set_if_not_set(CPACK_OUTPUT_CONFIG_FILE
--- 794,814 ----
  cpack_set_if_not_set(CPACK_CMAKE_GENERATOR "${CMAKE_GENERATOR}")
  cpack_set_if_not_set(CPACK_TOPLEVEL_TAG "${CPACK_SYSTEM_NAME}")
! # if the user has set CPACK_NSIS_DISPLAY_NAME remember it
! if(DEFINED CPACK_NSIS_DISPLAY_NAME)
!   SET(CPACK_NSIS_DISPLAY_NAME_SET TRUE)
! endif()
! # if the user has set CPACK_NSIS_DISPLAY
! # explicitly, then use that as the default
! # value of CPACK_NSIS_PACKAGE_NAME  instead
! # of CPACK_PACKAGE_INSTALL_DIRECTORY 
  cpack_set_if_not_set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
! 
! if(CPACK_NSIS_DISPLAY_NAME_SET)
!   string(REPLACE "\\" "\\\\" 
!     _NSIS_DISPLAY_NAME_TMP  "${CPACK_NSIS_DISPLAY_NAME}")
!   cpack_set_if_not_set(CPACK_NSIS_PACKAGE_NAME "${_NSIS_DISPLAY_NAME_TMP}")
! else()
!   cpack_set_if_not_set(CPACK_NSIS_PACKAGE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
! endif()
  
  cpack_set_if_not_set(CPACK_OUTPUT_CONFIG_FILE