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
281bd83b
Commit
281bd83b
authored
8 years ago
by
Martyn Gigg
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #17252 from mantidproject/17251_framework_packaging
Framework packaging
parents
ca5d6779
daee3fa5
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
buildconfig/CMake/LinuxPackageScripts.cmake
+19
-15
19 additions, 15 deletions
buildconfig/CMake/LinuxPackageScripts.cmake
with
20 additions
and
16 deletions
CMakeLists.txt
+
1
−
1
View file @
281bd83b
...
...
@@ -224,7 +224,7 @@ endif ()
install
(
DIRECTORY installers/colormaps/ DESTINATION
${
INBUNDLE
}
colormaps
)
# Install the files (.desktop and icon) to create a menu item, but only if installing to /opt/Mantid
if
(
${
CMAKE_SYSTEM_NAME
}
STREQUAL
"Linux"
AND CMAKE_INSTALL_PREFIX STREQUAL
"/opt/Mantid"
)
if
(
ENABLE_MANTIDPLOT AND
${
CMAKE_SYSTEM_NAME
}
STREQUAL
"Linux"
AND CMAKE_INSTALL_PREFIX STREQUAL
"/opt/Mantid"
)
install
(
FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/installers/LinuxInstaller/mantidplot.desktop
DESTINATION /usr/share/applications
)
install
(
FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/images/MantidPlot_Icon_32offset.png
...
...
This diff is collapsed.
Click to expand it.
buildconfig/CMake/LinuxPackageScripts.cmake
+
19
−
15
View file @
281bd83b
...
...
@@ -135,12 +135,14 @@ endif ()
# Local dev version
set
(
EXTRA_LDPATH
"
${
ParaView_DIR
}
/lib"
)
set
(
MANTIDPLOT_EXEC MantidPlot
)
configure_file
(
${
CMAKE_MODULE_PATH
}
/Packaging/launch_mantidplot.sh.in
${
CMAKE_RUNTIME_OUTPUT_DIRECTORY
}
/launch_mantidplot.sh @ONLY
)
# Needs to be executable
execute_process
(
COMMAND
"chmod"
"+x"
"
${
CMAKE_RUNTIME_OUTPUT_DIRECTORY
}
/launch_mantidplot.sh"
OUTPUT_QUIET ERROR_QUIET
)
if
(
ENABLE_MANTIDPLOT
)
set
(
MANTIDPLOT_EXEC MantidPlot
)
configure_file
(
${
CMAKE_MODULE_PATH
}
/Packaging/launch_mantidplot.sh.in
${
CMAKE_RUNTIME_OUTPUT_DIRECTORY
}
/launch_mantidplot.sh @ONLY
)
# Needs to be executable
execute_process
(
COMMAND
"chmod"
"+x"
"
${
CMAKE_RUNTIME_OUTPUT_DIRECTORY
}
/launch_mantidplot.sh"
OUTPUT_QUIET ERROR_QUIET
)
endif
()
configure_file
(
${
CMAKE_MODULE_PATH
}
/Packaging/mantidpython.in
${
CMAKE_RUNTIME_OUTPUT_DIRECTORY
}
/mantidpython @ONLY
)
# Needs to be executable
...
...
@@ -149,15 +151,17 @@ execute_process ( COMMAND "chmod" "+x" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mantid
# Package version
set
(
EXTRA_LDPATH
"
\$
{INSTALLDIR}/../lib/paraview-5.1"
)
set
(
MANTIDPLOT_EXEC MantidPlot_exe
)
configure_file
(
${
CMAKE_MODULE_PATH
}
/Packaging/launch_mantidplot.sh.in
${
CMAKE_CURRENT_BINARY_DIR
}
/launch_mantidplot.sh.install @ONLY
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/launch_mantidplot.sh.install
DESTINATION
${
BIN_DIR
}
RENAME launch_mantidplot.sh
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ
WORLD_EXECUTE WORLD_READ
)
if
(
ENABLE_MANTIDPLOT
)
set
(
MANTIDPLOT_EXEC MantidPlot_exe
)
configure_file
(
${
CMAKE_MODULE_PATH
}
/Packaging/launch_mantidplot.sh.in
${
CMAKE_CURRENT_BINARY_DIR
}
/launch_mantidplot.sh.install @ONLY
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/launch_mantidplot.sh.install
DESTINATION
${
BIN_DIR
}
RENAME launch_mantidplot.sh
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ
WORLD_EXECUTE WORLD_READ
)
endif
()
configure_file
(
${
CMAKE_MODULE_PATH
}
/Packaging/mantidpython.in
${
CMAKE_CURRENT_BINARY_DIR
}
/mantidpython.install @ONLY
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/mantidpython.install
...
...
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