refs #5103. Force Uninstall added to NSIS script.

mantidproject · Apr 19, 2012 · d49b4a3 · d49b4a3
1 parent 381e092
commit d49b4a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Code/Mantid/Build/CMake/NSIS.template.in b/Code/Mantid/Build/CMake/NSIS.template.in
@@ -36,6 +36,8 @@
 
   ;Set compression
   SetCompressor @CPACK_NSIS_COMPRESSOR@
+
+  SetOverwrite @CPACK_NSIS_FORCE_OVERWRITE@
 
 @CPACK_NSIS_DEFINES@   
 

diff --git a/Code/Mantid/Build/CMake/WindowsNSIS.cmake b/Code/Mantid/Build/CMake/WindowsNSIS.cmake
@@ -14,8 +14,10 @@
 	set( CPACK_INSTALL_PREFIX "/")
 	set( CPACK_NSIS_DISPLAY_NAME "Mantid${CPACK_PACKAGE_SUFFIX}")
 	set( CPACK_PACKAGE_NAME "Mantid${CPACK_PACKAGE_SUFFIX}" )
-	set( CPACK_PACKAGE_INSTALL_DIRECTORY "MantidInstall${CPACK_PACKAGE_SUFFIX}")
+	set( CPACK_PACKAGE_INSTALL_DIRECTORY "MantidInstall${CPACK_PACKAGE_SUFFIX}") 
 	set( CPACK_NSIS_INSTALL_ROOT "C:")
+	set( CPACK_NSIS_FORCE_OVERWRITE on CACHE STRING "Force installer to overwrite any existing install")
+	set_property(CACHE CPACK_NSIS_FORCE_OVERWRITE PROPERTY STRINGS on off)
 
 	#set( CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL "ON")
 	set( CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/Images\\\\MantidPlot_Icon_32offset.png" )