diff --git a/doc/conf/conf.py b/doc/conf/conf.py index 9ddc034d552ed0d85a7f74aa500d22ed415ecd68..78949cd7a85e80047bb397debf755fd8385827ee 100644 --- a/doc/conf/conf.py +++ b/doc/conf/conf.py @@ -42,7 +42,7 @@ master_doc = 'index' # General information about the project. project = u'OpenStructure' -copyright = u'2011, OpenStructure authors' +copyright = u'2018, OpenStructure authors' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/modules/doc/install.rst b/modules/doc/install.rst index 585dafe3cfd87a45afcd88c6cccec4213a83a125..36e74440821905a303fd7a501268cfc422c17767 100644 --- a/modules/doc/install.rst +++ b/modules/doc/install.rst @@ -299,16 +299,8 @@ from source. On some Linux distributions, there are issues with Qt4 and hence it may not be possible to build OpenStructure with GUI support at all. This is for instance -known to be an issue with boost versions >= 1.62. - -An additional problem arises for gcc versions >= 6. There an extra flag is -required to use the C++98 standard: - -.. code-block:: bash - - cmake . -DOPTIMIZE=ON -DENABLE_INFO=OFF -DCMAKE_CXX_FLAGS='-std=c++98' - -We hope to support Qt5 and C++11 in the next OpenStructure release. +known to be an issue with boost versions >= 1.62. We hope to support Qt5 in the +next OpenStructure release. **Ubuntu 16.04 with GUI** @@ -342,12 +334,11 @@ All the dependencies can be installed from the package manager as follows: sudo dnf install cmake eigen3-devel boost-devel libpng-devel python2-devel \ fftw-devel libtiff-devel -Fedora 26 has gcc 7 and boost 1.63 by default. Hence, we will need to disable -Qt4, the GUI and add the extra flag described above: +Here, we compile a version without GUI as follows: .. code-block:: bash - cmake . -DOPTIMIZE=ON -DENABLE_INFO=OFF -DCMAKE_CXX_FLAGS='-std=c++98' + cmake . -DOPTIMIZE=ON -DENABLE_INFO=OFF **macOS with Homebrew without GUI**