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
52ca7f69
Commit
52ca7f69
authored
9 years ago
by
Matthew D Jones
Browse files
Options
Downloads
Patches
Plain Diff
Re #14037 Added new icons and configured in cmake nsis file
parent
397f5980
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
buildconfig/CMake/WindowsNSIS.cmake
+12
-6
12 additions, 6 deletions
buildconfig/CMake/WindowsNSIS.cmake
images/mantid_notebook.ico
+0
-0
0 additions, 0 deletions
images/mantid_notebook.ico
images/mantid_python.ico
+0
-0
0 additions, 0 deletions
images/mantid_python.ico
with
12 additions
and
6 deletions
buildconfig/CMake/WindowsNSIS.cmake
+
12
−
6
View file @
52ca7f69
...
@@ -167,6 +167,12 @@ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/buildconfig/CMake/Packaging/launch_m
...
@@ -167,6 +167,12 @@ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/buildconfig/CMake/Packaging/launch_m
install
(
FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/buildconfig/CMake/Packaging/launch_mantidplot.vbs DESTINATION bin
)
install
(
FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/buildconfig/CMake/Packaging/launch_mantidplot.vbs DESTINATION bin
)
install
(
FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/buildconfig/CMake/Packaging/mantidpython.bat DESTINATION bin
)
install
(
FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/buildconfig/CMake/Packaging/mantidpython.bat DESTINATION bin
)
###########################################################################
# Icons for shortcuts
###########################################################################
install
(
FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/images/mantid_notebook.ico DESTINATION bin
)
install
(
FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/images/mantid_python.ico DESTINATION bin
)
###########################################################################
###########################################################################
# Extra NSIS commands for shortcuts, start menu items etc
# Extra NSIS commands for shortcuts, start menu items etc
# Three backward slashes are required to escape a character to get the
# Three backward slashes are required to escape a character to get the
...
@@ -176,22 +182,22 @@ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/buildconfig/CMake/Packaging/mantidpy
...
@@ -176,22 +182,22 @@ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/buildconfig/CMake/Packaging/mantidpy
set
(
CPACK_NSIS_CREATE_ICONS_EXTRA
"
set
(
CPACK_NSIS_CREATE_ICONS_EXTRA
"
CreateShortCut '$SMPROGRAMS
\\\\
$STARTMENU_FOLDER
\\\\
MantidPlot.lnk' '$SYSDIR
\\\\
wscript.exe' '
\\\"
$INSTDIR
\\\\
bin
\\\\
launch_mantidplot.vbs
\\\"
' '$INSTDIR
\\\\
bin
\\\\
MantidPlot.exe' 0
CreateShortCut '$SMPROGRAMS
\\\\
$STARTMENU_FOLDER
\\\\
MantidPlot.lnk' '$SYSDIR
\\\\
wscript.exe' '
\\\"
$INSTDIR
\\\\
bin
\\\\
launch_mantidplot.vbs
\\\"
' '$INSTDIR
\\\\
bin
\\\\
MantidPlot.exe' 0
CreateShortCut
\\\"
$SMPROGRAMS
\\\\
$STARTMENU_FOLDER
\\\\
MantidPython.lnk
\\\"
\\\"
$INSTDIR
\\\\
bin
\\\\
mantidpython.bat
\\\"
CreateShortCut
'
$SMPROGRAMS
\\\\
$STARTMENU_FOLDER
\\\\
MantidPython.lnk
' '
$INSTDIR
\\\\
bin
\\\\
mantidpython.bat
' '' '$INSTDIR
\\\\
bin
\\\\
mantid_python.ico'
CreateShortCut '$SMPROGRAMS
\\\\
$STARTMENU_FOLDER
\\\\
Mantid
IPython
Notebook.lnk' '$INSTDIR
\\\\
bin
\\\\
mantidpython.bat' 'notebook --notebook-dir=%userprofile%'
CreateShortCut '$SMPROGRAMS
\\\\
$STARTMENU_FOLDER
\\\\
MantidNotebook.lnk' '$INSTDIR
\\\\
bin
\\\\
mantidpython.bat' 'notebook --notebook-dir=%userprofile%'
'$INSTDIR
\\\\
bin
\\\\
mantid_notebook.ico'
"
)
"
)
set
(
CPACK_NSIS_DELETE_ICONS_EXTRA
"
set
(
CPACK_NSIS_DELETE_ICONS_EXTRA
"
Delete
\\\"
$SMPROGRAMS
\\\\
$MUI_TEMP
\\\\
MantidPlot.lnk
\\\"
Delete
\\\"
$SMPROGRAMS
\\\\
$MUI_TEMP
\\\\
MantidPlot.lnk
\\\"
Delete
\\\"
$SMPROGRAMS
\\\\
$MUI_TEMP
\\\\
MantidPython.lnk
\\\"
Delete
\\\"
$SMPROGRAMS
\\\\
$MUI_TEMP
\\\\
MantidPython.lnk
\\\"
Delete
\\\"
$SMPROGRAMS
\\\\
$MUI_TEMP
\\\\
Mantid
IPython
Notebook.lnk
\\\"
Delete
\\\"
$SMPROGRAMS
\\\\
$MUI_TEMP
\\\\
MantidNotebook.lnk
\\\"
"
)
"
)
# The blank lines seem to be required or it doesn't create the shortcut
# The blank lines seem to be required or it doesn't create the shortcut
set
(
CPACK_NSIS_EXTRA_INSTALL_COMMANDS
"
set
(
CPACK_NSIS_EXTRA_INSTALL_COMMANDS
"
CreateShortCut '$DESKTOP
\\\\
MantidPlot.lnk' '$SYSDIR
\\\\
wscript.exe' '
\\\"
$INSTDIR
\\\\
bin
\\\\
launch_mantidplot.vbs
\\\"
' '$INSTDIR
\\\\
bin
\\\\
MantidPlot.exe' 0
CreateShortCut '$DESKTOP
\\\\
MantidPlot.lnk' '$SYSDIR
\\\\
wscript.exe' '
\\\"
$INSTDIR
\\\\
bin
\\\\
launch_mantidplot.vbs
\\\"
' '$INSTDIR
\\\\
bin
\\\\
MantidPlot.exe' 0
CreateShortCut
\\\"
$DESKTOP
\\\\
MantidPython.lnk
\\\"
\\\"
$INSTDIR
\\\\
bin
\\\\
mantidpython.bat
\\\"
CreateShortCut
'
$DESKTOP
\\\\
MantidPython.lnk
' '
$INSTDIR
\\\\
bin
\\\\
mantidpython.bat
' '' '$INSTDIR
\\\\
bin
\\\\
mantid_python.ico'
CreateShortCut '$DESKTOP
\\\\
Mantid
IPython
Notebook.lnk' '$INSTDIR
\\\\
bin
\\\\
mantidpython.bat' 'notebook --notebook-dir=%userprofile%'
CreateShortCut '$DESKTOP
\\\\
MantidNotebook.lnk' '$INSTDIR
\\\\
bin
\\\\
mantidpython.bat' 'notebook --notebook-dir=%userprofile%'
'$INSTDIR
\\\\
bin
\\\\
mantid_notebook.ico'
CreateDirectory
\\\"
$INSTDIR
\\\\
logs
\\\"
CreateDirectory
\\\"
$INSTDIR
\\\\
logs
\\\"
...
@@ -201,7 +207,7 @@ set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
...
@@ -201,7 +207,7 @@ set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
set
(
CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
"
set
(
CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
"
Delete
\\\"
$DESKTOP
\\\\
MantidPlot.lnk
\\\"
Delete
\\\"
$DESKTOP
\\\\
MantidPlot.lnk
\\\"
Delete
\\\"
$DESKTOP
\\\\
MantidPython.lnk
\\\"
Delete
\\\"
$DESKTOP
\\\\
MantidPython.lnk
\\\"
Delete
\\\"
$DESKTOP
\\\\
Mantid
IPython
Notebook.lnk
\\\"
Delete
\\\"
$DESKTOP
\\\\
MantidNotebook.lnk
\\\"
RMDir
\\\"
$INSTDIR
\\\\
logs
\\\"
RMDir
\\\"
$INSTDIR
\\\\
logs
\\\"
RMDir
\\\"
$INSTDIR
\\\\
docs
\\\"
RMDir
\\\"
$INSTDIR
\\\\
docs
\\\"
"
)
"
)
This diff is collapsed.
Click to expand it.
images/mantid_notebook.ico
0 → 100644
+
0
−
0
View file @
52ca7f69
264 KiB
This diff is collapsed.
Click to expand it.
images/mantid_python.ico
0 → 100644
+
0
−
0
View file @
52ca7f69
264 KiB
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