Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feature/9843_integrate_sysmonitor_widget Conflicts: Code/Mantid/MantidPlot/CMakeLists.txt Code/Mantid/MantidPlot/src/ApplicationWindow.cpp
- Loading branch information
Showing
1,342 changed files
with
52,367 additions
and
296,037 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,13 @@ | ||
The [developer documentation](http://www.mantidproject.org/Category:Development) has information on how to participate in the mantid project as a developer. This document is meant to outline the steps for contributing to mantid without becomming a developer. | ||
The [developer documentation](http://www.mantidproject.org/Category:Development) has information on how to participate in the mantid project as a developer. This document is meant to outline the steps for contributing to mantid without becomming a developer. We aspire to have similar guidelines as [github](https://github.com/blog/1943-how-to-write-the-perfect-pull-request). | ||
|
||
1. [Fork](https://help.github.com/articles/fork-a-repo) the repository. | ||
2. Make changes as you see fit. Please still follow the guidelines for [running the unit tests](http://www.mantidproject.org/Running_the_unit_tests) and the [build servers](http://www.mantidproject.org/The_automated_build_process). | ||
3. Before submitting pull requests email mantid-help@mantidproject.org, and a developer will set up a branch that you can submit pull requests to. | ||
4. Submit a [pull request](https://help.github.com/articles/using-pull-requests) to this branch. | ||
4. Submit a [pull request](https://help.github.com/articles/using-pull-requests) to this branch. This is a start to the conversation. | ||
3. (Optional) email mantid-help@mantidproject.org requests to. | ||
|
||
|
||
Hints to make the integration of your changes easy: | ||
Hints to make the integration of your changes easy (and happen faster): | ||
- Keep your pull requests small | ||
- Some comments are part of the build server infrastructure (e.g. 'test this please') | ||
- Don't forget your unit tests | ||
- All algorithms need documentation, don't forget the .rst file | ||
- Contact us before creating the pull request | ||
- Don't take changes requests to change your code personally |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
################################################################################ | ||
# Setup the ExternalData variables for the project | ||
################################################################################ | ||
include(ExternalData) | ||
|
||
if(NOT MANTID_DATA_STORE) | ||
# Select a default in the home directory | ||
set(MANTID_DATA_STORE_DEFAULT "$ENV{HOME}/MantidExternalData") | ||
endif() | ||
|
||
# Provide users with an option to select a local object store, | ||
# starting with the above-selected default. | ||
set(MANTID_DATA_STORE "${MANTID_DATA_STORE_DEFAULT}" CACHE PATH | ||
"Local directory holding ExternalData objects in the layout %(algo)/%(hash).") | ||
mark_as_advanced(MANTID_DATA_STORE) | ||
|
||
if(NOT MANTID_DATA_STORE) | ||
message(FATAL_ERROR "MANTID_DATA_STORE not set. It is required for external data") | ||
endif() | ||
|
||
# Tell ExternalData module about selected object stores. | ||
list(APPEND ExternalData_OBJECT_STORES | ||
# Store selected by Mantid-specific configuration above. | ||
${MANTID_DATA_STORE} | ||
) | ||
|
||
# Default binary root to build directory | ||
set(ExternalData_BINARY_ROOT ${CMAKE_BINARY_DIR}/ExternalData CACHE STRING | ||
"A directory holding the links (copies on windows) to the real content files.") | ||
|
||
set(ExternalData_URL_TEMPLATES "" CACHE STRING | ||
"Additional URL templates for the ExternalData CMake script to look for testing data. E.g. | ||
file:///var/bigharddrive/%(algo)/%(hash)") | ||
mark_as_advanced(ExternalData_URL_TEMPLATES) | ||
list(APPEND ExternalData_URL_TEMPLATES | ||
"http://198.74.56.37/ftp/external-data/%(algo)/%(hash)" | ||
) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.