refs #5103. Uniform install locations for Windows.

Two changes here. Firstly Mantid will go directly into MantidInstall, so installation on windows via cpack will look very similar to that on windows via Wxs. Secondly the non-release distributions i.e (nightly, unstable) will go into completely different top level directories under c:/ by default
mantidproject · Apr 18, 2012 · 381e092 · 381e092
1 parent e168ad4
commit 381e092
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Code/Mantid/Build/CMake/WindowsNSIS.cmake b/Code/Mantid/Build/CMake/WindowsNSIS.cmake
@@ -11,10 +11,11 @@
 
 	#Windows CPACK specifics
 	set( CPACK_GENERATOR "NSIS" )
-	set( CPACK_SET_DESTDIR "ON") 
 	set( CPACK_INSTALL_PREFIX "/")
-	set( CPACK_PACKAGE_INSTALL_DIRECTORY "Mantid${CPACK_PACKAGE_SUFFIX}")
-	set( CPACK_NSIS_INSTALL_ROOT "C:\\\\MantidInstall")
+	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_NSIS_INSTALL_ROOT "C:")
 
 	#set( CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL "ON")
 	set( CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/Images\\\\MantidPlot_Icon_32offset.png" )
@@ -152,6 +153,8 @@
 		    RMDir \\\"$INSTDIR\\\\docs\\\"
 	    ")
 	else ()
+	set( CPACK_PACKAGE_INSTALL_DIRECTORY "MantidInstall${CPACK_PACKAGE_SUFFIX}")
+	set( CPACK_NSIS_INSTALL_ROOT "C:")
 	# On install
 	    set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
             CreateShortCut \\\"$DESKTOP\\\\MantidPlot.lnk\\\" \\\"$INSTDIR\\\\bin\\\\MantidPlot.exe\\\"