Skip to content
Snippets Groups Projects
Commit 79edde36 authored by Gerardo Tauriello's avatar Gerardo Tauriello
Browse files

Merge branch 'develop' into release-1.10.0

These are only updates to documentation.
parents 7395e2a2 35a4fc84
No related branches found
No related tags found
No related merge requests found
......@@ -79,8 +79,8 @@ class CADResult:
Dictionary containing local CAD's atom-atom (AA) scores.
:type: dictionary (key: tuple(chain, resnum) (e.g.:
("A", ost.mol.ResNum(24)), value: CAD local AA score
(see CAD Documentation online)
("A", ost.mol.ResNum(24)), value: CAD local AA score
(see CAD Documentation online)
"""
def __init__(self, globalAA, localAA):
self.globalAA=globalAA
......
......@@ -328,7 +328,8 @@ line. If omitted, the linker will throw a bunch of warnings later:
.. code-block:: bash
export SDKROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
export SDKROOT=/Applications/Xcode.app/Contents/Developer/Platforms/\
MacOSX.platform/Developer/SDKs/MacOSX.sdk
If building the info module or with graphical user interface, get the Qt
binaries in your Path for CMake to determine its configuration:
......@@ -343,8 +344,10 @@ located as they are on Linux and hence they must be specified too:
.. code-block:: bash
cmake . -DPYTHON_INCLUDE_PATH=/usr/local/Cellar/python@2/2.7.16/Frameworks/Python.framework/Versions/2.7/include/python2.7 \
-DPYTHON_LIBRARIES=/usr/local/Cellar/python@2/2.7.16/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib \
cmake . -DPYTHON_INCLUDE_PATH=/usr/local/Cellar/python@2/2.7.16/\
Frameworks/Python.framework/Versions/2.7/include/python2.7 \
-DPYTHON_LIBRARIES=/usr/local/Cellar/python@2/2.7.16/\
Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib \
-DPYTHON_ROOT=/usr/local/ \
-DBOOST_ROOT=/usr/local \
-DSYS_ROOT=/usr/local \
......@@ -360,7 +363,8 @@ to run multiple jobs at once.
What's next?
--------------------------------------------------------------------------------
On Linux and macOS, you can start dng from the command-line. The binaries are all located in stage/bin:
On Linux and macOS, you can start dng from the command-line. The binaries are
all located in stage/bin:
.. code-block:: bash
......@@ -372,7 +376,8 @@ or, to start the command-line interpreter:
stage/bin/ost
If you repeatedly use OpenStructure, it is recommended to add /path/to/ost/stage/bin to your path.
If you repeatedly use OpenStructure, it is recommended to add
/path/to/ost/stage/bin to your path.
Getting the newest changes
--------------------------------------------------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment