From: rnv Date: Fri, 17 Aug 2018 11:52:26 +0000 (+0300) Subject: Detect sphinx theme directly in conf.py.in file X-Git-Tag: SHAPER_V9_1_0RC1~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ef7a7fc862857673e55d1c516c400b8084ce55d8;p=tools%2Fconfiguration.git Detect sphinx theme directly in conf.py.in file --- diff --git a/cmake/FindSphinx.cmake b/cmake/FindSphinx.cmake index 6688883..a540385 100644 --- a/cmake/FindSphinx.cmake +++ b/cmake/FindSphinx.cmake @@ -59,17 +59,6 @@ ENDIF() INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sphinx REQUIRED_VARS SPHINX_EXECUTABLE SPHINX_APIDOC_EXECUTABLE SPHINX_INTL_EXECUTABLE) -IF(SPHINX_EXECUTABLE) - EXECUTE_PROCESS(COMMAND ${SPHINX_EXECUTABLE} "--version" OUTPUT_VARIABLE SPHINX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) - STRING(REGEX REPLACE ".* ([0-9.]+)$" "\\1" SPHINX_VERSION "${SPHINX_VERSION}" ) - MESSAGE(STATUS "Sphinx version is ${SPHINX_VERSION}") - IF(SPHINX_VERSION VERSION_LESS "1.3") - SET(SPHINX_THEME "default") - ELSE() - SET(SPHINX_THEME "classic") - ENDIF() -ENDIF(SPHINX_EXECUTABLE) - FOREACH(_ext ${Sphinx_EXTENSIONS}) EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import ${_ext}; print 'ok'" OUTPUT_VARIABLE _has_ext ERROR_QUIET) IF(_has_ext)