From: Maintenance team (INV) <mnt@opencascade.com>
Date: Wed, 10 Sep 2014 19:22:50 +0000 (+0400)
Subject: Synchronize adm files
X-Git-Tag: V7_5_0a1~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4716274dd234caf7c1adb23db66cd41a58740acb;p=tools%2Fdocumentation.git

Synchronize adm files
---

diff --git a/CMakeModules/FindSalomeSphinx.cmake b/CMakeModules/FindSalomeSphinx.cmake
index 78378d6..4ef6c0f 100644
--- a/CMakeModules/FindSalomeSphinx.cmake
+++ b/CMakeModules/FindSalomeSphinx.cmake
@@ -31,13 +31,16 @@ SET(DOCUTILS_ROOT_DIR "$ENV{DOCUTILS_ROOT_DIR}" CACHE PATH "Path to the Docutils
 # Ensure the command is run with the given PYTHONPATH
 IF(WIN32 AND NOT CYGWIN)
    SET(SPHINX_EXECUTABLE ${SPHINX_EXECUTABLE})
+   SET(SPHINX_APIDOC_EXECUTABLE ${SPHINX_APIDOC_EXECUTABLE})
 ELSE()
    SET(SPHINX_EXECUTABLE /usr/bin/env PYTHONPATH="${SPHINX_PYTHONPATH}:$$PYTHONPATH" ${SPHINX_EXECUTABLE})
+   SET(SPHINX_APIDOC_EXECUTABLE /usr/bin/env PYTHONPATH="${SPHINX_PYTHONPATH}:$$PYTHONPATH" ${SPHINX_APIDOC_EXECUTABLE})
 ENDIF()
 
 MARK_AS_ADVANCED(SPHINX_EXECUTABLE)
 
 IF(SPHINX_FOUND)
   SALOME_ACCUMULATE_ENVIRONMENT(PATH ${SPHINX_EXECUTABLE})
+  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${SPHINX_APIDOC_EXECUTABLE})
   SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${SPHINX_PYTHONPATH})
 ENDIF()
diff --git a/CMakeModules/FindSphinx.cmake b/CMakeModules/FindSphinx.cmake
index c3fd775..01c3a3d 100644
--- a/CMakeModules/FindSphinx.cmake
+++ b/CMakeModules/FindSphinx.cmake
@@ -28,6 +28,7 @@
 #
 
 FIND_PROGRAM(SPHINX_EXECUTABLE sphinx-build PATH_SUFFIXES Scripts)
+FIND_PROGRAM(SPHINX_APIDOC_EXECUTABLE sphinx-apidoc PATH_SUFFIXES Scripts)
 
 # Get root dir locally, going up two levels from the exec:
 GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${SPHINX_EXECUTABLE}" PATH)
@@ -39,5 +40,5 @@ ELSE()
 ENDIF()
 # Handle the standard arguments of the find_package() command:
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sphinx REQUIRED_VARS SPHINX_EXECUTABLE)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sphinx REQUIRED_VARS SPHINX_EXECUTABLE SPHINX_APIDOC_EXECUTABLE)