Fix a bunch of NSIS installer properties.

axr · Nov 18, 2012 · de75622 · de75622
1 parent cba38b5
commit de75622
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/cmake/Package.cmake b/cmake/Package.cmake
@@ -57,20 +57,23 @@ set(CPACK_PACKAGE_EXECUTABLES "axrbrowser" "AXR Browser")
 
 if(WIN32)
     set(CPACK_GENERATOR "NSIS")
+    set(CPACK_NSIS_CONTACT "${AXR_CONTACT}")
+    set(CPACK_NSIS_DISPLAY_NAME "${BROWSER_PACKAGE_NAME}")
+    set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
+    set(CPACK_NSIS_EXECUTABLES_DIRECTORY .) # NSIS assumes executables are in bin by default
+    set(CPACK_NSIS_HELP_LINK "http://axr.vg")
+    set(CPACK_NSIS_INSTALLED_ICON_NAME "axrbrowser.exe")
     set(CPACK_NSIS_MUI_ICON "${AXR_PACKAGE_ICON}")
     set(CPACK_NSIS_MUI_UNIICON "${AXR_PACKAGE_ICON}")
-#    set(CPACK_PACKAGE_ICON "<something>.bmp")
-    set(CPACK_NSIS_INSTALLED_ICON_NAME "browser.exe")
-    set(CPACK_NSIS_HELP_LINK "http:\\\\\\\\axr.vg")
-    set(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\axr.vg")
-    set(CPACK_NSIS_CONTACT "${AXR_CONTACT}")
+    set(CPACK_NSIS_PACKAGE_NAME "${BROWSER_PACKAGE_NAME}")
+    set(CPACK_NSIS_URL_INFO_ABOUT "http://axr.vg")
 
-    # NSIS assumes executables are in bin by default
-    set(CPACK_NSIS_EXECUTABLES_DIRECTORY .)
+#   set(CPACK_PACKAGE_ICON "<something>.bmp")
+    set(CPACK_PACKAGE_INSTALL_DIRECTORY "${BROWSER_PACKAGE_NAME}")
 endif()
 
 if(APPLE)
-    set(CPACK_GENERATOR "PackageMaker")
+    set(CPACK_GENERATOR "DragNDrop")
     set(CPACK_DMG_VOLUME_NAME "${BROWSER_PACKAGE_NAME} ${BROWSER_VERSION_STRING}")
     set(CPACK_OSX_PACKAGE_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET})
 endif()