[Cmake-commits] [cmake-commits] hoffman committed CPack.cmake 1.46 1.47

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Nov 12 17:58:40 EST 2009


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

Modified Files:
	CPack.cmake 
Log Message:
Fix regression with CPACK_NSIS_PACKAGE_NAME, if the project is setting the CPACK_NSIS_DISPLAY_NAME then use that as the default value and not the CPACK_PACKAGE_INSTALL_DIRECTORY, also make sure it escapes \ correctly.


Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.46
retrieving revision 1.47
diff -C 2 -d -r1.46 -r1.47
*** CPack.cmake	28 Sep 2009 15:46:50 -0000	1.46
--- CPack.cmake	12 Nov 2009 22:58:37 -0000	1.47
***************
*** 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



More information about the Cmake-commits mailing list