From cf2bfdce248a8a62ad2dca2f14e05e91baf9d7e2 Mon Sep 17 00:00:00 2001 From: "Maintenance team (INV)" Date: Wed, 10 Sep 2014 23:22:40 +0400 Subject: [PATCH] Synchronize adm files --- adm/cmake/FindSalomeSphinx.cmake | 3 +++ adm/cmake/FindSphinx.cmake | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/adm/cmake/FindSalomeSphinx.cmake b/adm/cmake/FindSalomeSphinx.cmake index 78378d608..4ef6c0f07 100644 --- a/adm/cmake/FindSalomeSphinx.cmake +++ b/adm/cmake/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/adm/cmake/FindSphinx.cmake b/adm/cmake/FindSphinx.cmake index c3fd775b1..01c3a3d3e 100644 --- a/adm/cmake/FindSphinx.cmake +++ b/adm/cmake/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) -- 2.39.2