[Cmake-commits] [cmake-commits] hoffman committed CMakeCPackOptions.cmake.in 1.7 1.8

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeCPackOptions.cmake.in 
Log Message:
ENH: fix crash in cpack when CPACK_CYGWIN_PATCH_NUMBER not specified


Index: CMakeCPackOptions.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeCPackOptions.cmake.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** CMakeCPackOptions.cmake.in	18 Feb 2008 20:50:37 -0000	1.7
--- CMakeCPackOptions.cmake.in	13 Mar 2008 01:54:27 -0000	1.8
***************
*** 33,38 ****
    SET(CPACK_NSIS_MODIFY_PATH ON)
  endif(CPACK_GENERATOR MATCHES "NSIS")
! # include the cpack options 
! INCLUDE("@QT_DIALOG_CPACK_OPTIONS_FILE@")
  
  if(CPACK_GENERATOR MATCHES "CygwinSource")
--- 33,39 ----
    SET(CPACK_NSIS_MODIFY_PATH ON)
  endif(CPACK_GENERATOR MATCHES "NSIS")
! # include the cpack options for qt dialog if they exisit
! # they might not if qt was not enabled for the build
! INCLUDE("@QT_DIALOG_CPACK_OPTIONS_FILE@" OPTIONAL)
  
  if(CPACK_GENERATOR MATCHES "CygwinSource")