0023548: [CEA] Generation of documentation is broken if sphinxcontrib.napolen extensi...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d376e7f6ea0a06b3451b811cfde43d84b4cbd96..8c8dbfa0b5183494b954ade6cd5cd4fdbda6139e 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,6 +132,7 @@ IF(SALOME_BUILD_TESTS)
 ENDIF()
 IF(SALOME_BUILD_DOC)
   FIND_PACKAGE(SalomeDoxygen)
+  SET(Sphinx_EXTENSIONS sphinxcontrib.napoleon)
   FIND_PACKAGE(SalomeSphinx)
   SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC)
   SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)

diff --git a/doc/salome/gui/SMESH/conf.py.in b/doc/salome/gui/SMESH/conf.py.in
index 3f592e4360d4c127bbdf7a55a343be2d88969575..4d56b1b020c027d09a353ae7a6bce039a9acc229 100644 (file)
--- a/doc/salome/gui/SMESH/conf.py.in
+++ b/doc/salome/gui/SMESH/conf.py.in
@@ -23,9 +23,13 @@ import sys, os
 
 # 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',
-               'sphinxcontrib.napoleon'
-]
+extensions = ['sphinx.ext.autodoc']
+try:
+  import sphinxcontrib.napoleon
+  extensions += ['sphinxcontrib.napoleon']
+except:
+  pass
+
 #add pdfbuilder to build a pdf with rst2pdf
 #extensions = ['rst2pdf.pdfbuilder']