From: vsr <vsr@opencascade.com>
Date: Thu, 31 May 2018 14:16:47 +0000 (+0300)
Subject: Merge branch 'V8_5_asterstudy'
X-Git-Tag: SHAPER_V9_1_0RC1~31
X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=f513b3c72c0c9c1a0c68bae34813cb41ac6fdcd5;hp=-c

Merge branch 'V8_5_asterstudy'
---

f513b3c72c0c9c1a0c68bae34813cb41ac6fdcd5
diff --combined CMakeLists.txt
index 54257d382,ec4b32501..a3cadb232
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -33,11 -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 0)
 +SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
  
  # Common CMake macros
  # ===================
@@@ -81,7 -81,7 +81,7 @@@ OPTION(SALOME_SMESH_USE_CGNS       "Ena
  OPTION(SALOME_SMESH_USE_TBB        "Enable parallel computation" OFF)
  OPTION(SALOME_SMESH_DYNLOAD_LOCAL  "Load plug-ins' symbols locally (Linux only)" ON)
  CMAKE_DEPENDENT_OPTION(SALOME_SMESH_BUILD_FRENCH_DOC "Generate SALOME SMESH French documentation" OFF
-                        "NOT SALOME_BUILD_DOC" OFF)
+                        "SALOME_BUILD_DOC" OFF)
  
  IF(SALOME_SMESH_DYNLOAD_LOCAL)
    ADD_DEFINITIONS(-DDYNLOAD_LOCAL)
@@@ -132,6 -132,7 +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 --combined doc/salome/gui/SMESH/conf.py.in
index 31257973c,4d56b1b02..91124d948
--- a/doc/salome/gui/SMESH/conf.py.in
+++ b/doc/salome/gui/SMESH/conf.py.in
@@@ -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']