generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #829 from SpecLad:sphinx-ver-1

Browse Source
This commit is contained in:
Andrey Kamaev 2013-04-17 15:45:53 +04:00 committed by OpenCV Buildbot
commit a9a269505c
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/OpenCVDetectPython.cmake
View File

@ -104,18 +104,12 @@ if(PYTHON_EXECUTABLE)
if(BUILD_DOCS) if(BUILD_DOCS)
find_host_program(SPHINX_BUILD sphinx-build) find_host_program(SPHINX_BUILD sphinx-build)
if(SPHINX_BUILD) if(SPHINX_BUILD)
if(UNIX) execute_process(COMMAND "${SPHINX_BUILD}"
execute_process(COMMAND sh -c "${SPHINX_BUILD} -_ 2>&1 | sed -ne 1p" OUTPUT_QUIET
RESULT_VARIABLE SPHINX_PROCESS ERROR_VARIABLE SPHINX_OUTPUT
OUTPUT_VARIABLE SPHINX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
else() if(SPHINX_OUTPUT MATCHES "^Sphinx v([0-9][^ \n]*)")
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import sphinx; print sphinx.__version__" set(SPHINX_VERSION "${CMAKE_MATCH_1}")
RESULT_VARIABLE SPHINX_PROCESS
OUTPUT_VARIABLE SPHINX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
if(SPHINX_PROCESS EQUAL 0)
set(HAVE_SPHINX 1) set(HAVE_SPHINX 1)
message(STATUS "Found Sphinx ${SPHINX_VERSION}: ${SPHINX_BUILD}") message(STATUS "Found Sphinx ${SPHINX_VERSION}: ${SPHINX_BUILD}")
endif() endif()