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
d49b085d
Commit
d49b085d
authored
13 years ago
by
Russell Taylor
Browse files
Options
Downloads
Patches
Plain Diff
Yay! I can commit from my Mac. Now if only I had a working compiler on it.... Re #2752.
parent
d339be92
No related branches found
No related tags found
No related merge requests found
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Code/Mantid/CMakeLists.txt
+5
-1
5 additions, 1 deletion
Code/Mantid/CMakeLists.txt
Code/Mantid/Installers/MacInstaller/MacOSX-README.rtf
+37
-182
37 additions, 182 deletions
Code/Mantid/Installers/MacInstaller/MacOSX-README.rtf
with
42 additions
and
183 deletions
Code/Mantid/CMakeLists.txt
+
5
−
1
View file @
d49b085d
...
...
@@ -124,7 +124,7 @@ set ( ENABLE_CPACK CACHE BOOL "Switch to enable CPack package generation")
if
(
ENABLE_CPACK
)
# generic package level information
set
(
CPACK_PACKAGE_DESCRIPTION_SUMMARY
"Neutron Scattering Data Analysis"
)
#
set ( CPACK_PACKAGE_VENDOR "ISIS Rutherford Appleton Laboratory
&
NScD Oak Ridge National Laboratory" )
set
(
CPACK_PACKAGE_VENDOR
"ISIS Rutherford Appleton Laboratory
and
NScD Oak Ridge National Laboratory"
)
set
(
CPACK_PACKAGE_URL http://www.mantidproject.org/
)
set
(
CPACK_PACKAGE_CONTACT mantid-help@mantidproject.org
)
set
(
CPACK_PACKAGE_ICON Images/MantidPlot_Icon_32offset.png
)
...
...
@@ -134,6 +134,10 @@ if ( ENABLE_CPACK )
set
(
CPACK_PACKAGE_VERSION_MINOR 1
)
set
(
CPACK_PACKAGE_VERSION_PATCH
${
Framework_WC_LAST_CHANGED_REV
}
)
set
(
CPACK_PACKAGING_INSTALL_PREFIX
${
CMAKE_INSTALL_PREFIX
}
)
# Mac Packagemaker settings
set
(
CPACK_RESOURCE_FILE_README
${
CMAKE_SOURCE_DIR
}
/Installers/MacInstaller/MacOSX-README.rtf
)
set
(
CPACK_RESOURCE_FILE_LICENSE
${
CMAKE_SOURCE_DIR
}
/Installers/WinInstaller/License.rtf
)
# RPM information - only used if generating a rpm
#set ( CPACK_RPM_PACKAGE_ARCHITECTURE x86_64 )
...
...
This diff is collapsed.
Click to expand it.
Code/Mantid/Installers/MacInstaller/MacOSX-README.rtf
+
37
−
182
View file @
d49b085d
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