Salome HOME
Merge remote-tracking branch 'origin/master' into V8_5_BR V8_5_0rc1
authorrnv <rnv@opencascade.com>
Mon, 23 Apr 2018 16:06:30 +0000 (19:06 +0300)
committerrnv <rnv@opencascade.com>
Mon, 23 Apr 2018 16:06:30 +0000 (19:06 +0300)
CMakeLists.txt
doc/salome/gui/SMESH/conf.py.in

index 54257d3..8c8dbfa 100755 (executable)
@@ -33,11 +33,11 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 5)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
 
 # Common CMake macros
 # ===================
@@ -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)
index 3f592e4..4d56b1b 100644 (file)
@@ -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']