[cmake-commits] hoffman committed CPack.cmake 1.29 1.30 NSIS.template.in 1.23 1.24

[cmake-commits at cmake.org]

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

Modified Files:
	CPack.cmake NSIS.template.in 
Log Message:
ENH: allow CPACK_PACKAGE_ICON to be not set


Index: NSIS.template.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/NSIS.template.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- NSIS.template.in	18 Oct 2007 13:40:09 -0000	1.23
+++ NSIS.template.in	22 Oct 2007 15:40:07 -0000	1.24
@@ -408,11 +408,7 @@
 
 ;--------------------------------
 ; Define some macro setting for the gui
-
-  !define CPACK_PACKAGE_ICON "@CPACK_PACKAGE_ICON@"
-  !ifdef CPACK_PACKAGE_ICON
-    !define MUI_HEADERIMAGE_BITMAP "@CPACK_PACKAGE_ICON@"
-  !endif
+ at CPACK_NSIS_INSTALLER_ICON_CODE@
 
 ;--------------------------------
 ;Pages

Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- CPack.cmake	31 Aug 2007 20:27:08 -0000	1.29
+++ CPack.cmake	22 Oct 2007 15:40:07 -0000	1.30
@@ -184,6 +184,16 @@
 cpack_set_if_not_set(CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
 
 cpack_encode_variables()
+cpack_set_if_not_set(CPACK_NSIS_INSTALLER_ICON_CODE "")
+if(CPACK_PACKAGE_ICON)
+  set(CPACK_NSIS_INSTALLER_ICON_CODE "
+!define CPACK_PACKAGE_ICON "@CPACK_PACKAGE_ICON@
+!define MUI_HEADERIMAGE_BITMAP "@CPACK_PACKAGE_ICON@
+")
+endif(CPACK_PACKAGE_ICON)
+
+
+
 configure_file("${cpack_input_file}" "${CPACK_OUTPUT_CONFIG_FILE}" @ONLY IMMEDIATE)
 
 # Generate source file