X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=adm%2Fcmake%2FFindSalomeSphinx.cmake;h=03e6be0241cdacd2bde201b6aa1406bc110c7ee6;hb=ac53a6173bb848e3a0d57e3cea4251c983c2d772;hp=78378d6084b378ebc55925e08b9b813cee7e267e;hpb=2011fadca4edcb7ee53d777166ec2b097ac2aded;p=modules%2Fyacs.git diff --git a/adm/cmake/FindSalomeSphinx.cmake b/adm/cmake/FindSalomeSphinx.cmake index 78378d608..03e6be024 100644 --- a/adm/cmake/FindSalomeSphinx.cmake +++ b/adm/cmake/FindSalomeSphinx.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -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()