Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
d49b4a37
Commit
d49b4a37
authored
12 years ago
by
Owen Arnold
Browse files
Options
Downloads
Patches
Plain Diff
refs #5103. Force Uninstall added to NSIS script.
parent
381e092d
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Code/Mantid/Build/CMake/NSIS.template.in
+2
-0
2 additions, 0 deletions
Code/Mantid/Build/CMake/NSIS.template.in
Code/Mantid/Build/CMake/WindowsNSIS.cmake
+3
-1
3 additions, 1 deletion
Code/Mantid/Build/CMake/WindowsNSIS.cmake
with
5 additions
and
1 deletion
Code/Mantid/Build/CMake/NSIS.template.in
+
2
−
0
View file @
d49b4a37
...
@@ -36,6 +36,8 @@
...
@@ -36,6 +36,8 @@
;Set compression
;Set compression
SetCompressor @CPACK_NSIS_COMPRESSOR@
SetCompressor @CPACK_NSIS_COMPRESSOR@
SetOverwrite @CPACK_NSIS_FORCE_OVERWRITE@
@CPACK_NSIS_DEFINES@
@CPACK_NSIS_DEFINES@
...
...
This diff is collapsed.
Click to expand it.
Code/Mantid/Build/CMake/WindowsNSIS.cmake
+
3
−
1
View file @
d49b4a37
...
@@ -14,8 +14,10 @@
...
@@ -14,8 +14,10 @@
set
(
CPACK_INSTALL_PREFIX
"/"
)
set
(
CPACK_INSTALL_PREFIX
"/"
)
set
(
CPACK_NSIS_DISPLAY_NAME
"Mantid
${
CPACK_PACKAGE_SUFFIX
}
"
)
set
(
CPACK_NSIS_DISPLAY_NAME
"Mantid
${
CPACK_PACKAGE_SUFFIX
}
"
)
set
(
CPACK_PACKAGE_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_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_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL "ON")
set
(
CPACK_PACKAGE_ICON
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/Images
\\\\
MantidPlot_Icon_32offset.png"
)
set
(
CPACK_PACKAGE_ICON
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/Images
\\\\
MantidPlot_Icon_32offset.png"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment