diff --git a/CMakeLists.txt b/CMakeLists.txt index c05fbd23f..03553e34a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1702,8 +1702,12 @@ endif() status("") status(" Documentation:") status(" Sphinx:" HAVE_SPHINX THEN "${SPHINX_BUILD} (ver ${SPHINX_VERSION})" ELSE NO) -status(" PdfLaTeX compiler:" BUILD_DOCS AND PDFLATEX_COMPILER THEN "${PDFLATEX_COMPILER}" ELSE NO) -status(" Build Documentation:" BUILD_DOCS AND PDFLATEX_COMPILER AND HAVE_SPHINX THEN YES ELSE NO) +status(" PdfLaTeX compiler:" PDFLATEX_COMPILER THEN "${PDFLATEX_COMPILER}" ELSE NO) +if (BUILD_DOCS AND HAVE_SPHINX) + status(" Build Documentation:" PDFLATEX_COMPILER THEN YES ELSE "YES (HTML only)") +else() + status(" Build Documentation:" NO) +endif() # samples and tests status("") diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 6ad33cde0..638d7dee7 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -7,7 +7,7 @@ file(GLOB FILES_DOC_VS vidsurv/*.doc) file(GLOB FILES_TEX *.tex *.sty *.bib) file(GLOB FILES_TEX_PICS pics/*.png pics/*.jpg) -if(BUILD_DOCS AND PDFLATEX_COMPILER AND HAVE_SPHINX) +if(BUILD_DOCS AND HAVE_SPHINX) project(opencv_docs) @@ -20,6 +20,7 @@ file(GLOB_RECURSE OPENCV_FILES_TUT_PICT tutorials/*.png tutorials/*.jpg) set(OPENCV_DOC_DEPS conf.py ${OPENCV_FILES_REF} ${OPENCV_FILES_REF_PICT} ${OPENCV_FILES_UG} ${OPENCV_FILES_TUT} ${OPENCV_FILES_TUT_PICT}) +if (PDFLATEX_COMPILER) add_custom_target(docs ${SPHINX_BUILD} -b latex -c ${CMAKE_CURRENT_SOURCE_DIR} @@ -37,6 +38,8 @@ add_custom_target(docs DEPENDS ${OPENCV_DOC_DEPS} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating the PDF Manuals") + +endif() add_custom_target(html_docs ${SPHINX_BUILD}