Salome HOME
Merge branch 'V8_5_asterstudy'
authorvsr <vsr@opencascade.com>
Thu, 31 May 2018 14:16:47 +0000 (17:16 +0300)
committervsr <vsr@opencascade.com>
Thu, 31 May 2018 14:16:47 +0000 (17:16 +0300)
1  2 
CMakeLists.txt
doc/salome/gui/SMESH/conf.py.in

diff --cc CMakeLists.txt
Simple merge
@@@ -23,9 -23,13 +23,13 @@@ import sys, o
  
  # Add any Sphinx extension module names here, as strings. They can be extensions
  # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
- extensions = ['sphinx.ext.autodoc','sphinx.ext.autosummary',
-                'sphinxcontrib.napoleon'
- ]
 -extensions = ['sphinx.ext.autodoc']
++extensions = ['sphinx.ext.autodoc','sphinx.ext.autosummary']
+ try:
+   import sphinxcontrib.napoleon
+   extensions += ['sphinxcontrib.napoleon']
+ except:
+   pass
  #add pdfbuilder to build a pdf with rst2pdf
  #extensions = ['rst2pdf.pdfbuilder']