[cmake-commits] hoffman committed CPack.cmake 1.30 1.31

[cmake-commits at cmake.org]

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

Modified Files:
	CPack.cmake 
Log Message:
ENH: fix bitmap escapes


Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- CPack.cmake	22 Oct 2007 15:40:07 -0000	1.30
+++ CPack.cmake	22 Oct 2007 21:16:33 -0000	1.31
@@ -183,15 +183,21 @@
 cpack_set_if_not_set(CPACK_USE_DESTDIR ON)
 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 is set, then create a 
+# cpack variable that contains the NSIS code to define
+# the CPACK_PACKAGE_ICON and MUI_HEADERIMAGE_BITMAP, this is used
+# as an icon in the install wizard
 if(CPACK_PACKAGE_ICON)
   set(CPACK_NSIS_INSTALLER_ICON_CODE "
-!define CPACK_PACKAGE_ICON "@CPACK_PACKAGE_ICON@
-!define MUI_HEADERIMAGE_BITMAP "@CPACK_PACKAGE_ICON@
+!define CPACK_PACKAGE_ICON \\\"@CPACK_PACKAGE_ICON@\\\"
+!define MUI_HEADERIMAGE_BITMAP \\\"@CPACK_PACKAGE_ICON@\\\"
 ")
 endif(CPACK_PACKAGE_ICON)
 
+cpack_encode_variables()
+
 
 
 configure_file("${cpack_input_file}" "${CPACK_OUTPUT_CONFIG_FILE}" @ONLY IMMEDIATE)