Ticket #46978: patch-doc-building.diff

File patch-doc-building.diff, 1.0 KB (added by RJVB (René Bertin), 10 years ago)

  • docs/CMakeLists.txt 

    diff --git docs/CMakeLists.txt docs/CMakeLists.txt
index f17400f..2dd6b8b 100644
    message(STATUS "Looking for Sphinx Documentation Builder...") 
    1717find_program(SPHINX_EXECUTABLE
    1818    NAMES
    1919        sphinx-build
    20         sphinx-build2
    21         sphinx-build3
     20        sphinx-build-3.4
     21        sphinx-build-3.3
     22        sphinx-build-2.7
    2223    DOC "Sphinx Documentation Builder (http://sphinx-doc.org/)"
    2324)
    2425if(SPHINX_EXECUTABLE)
    … … if(BUILD_QTHELP_DOCS) 
    6768    set(qthelp_extra_commands
    6869        COMMAND
    6970            qcollectiongenerator
    70             ${CMAKE_CURRENT_BINARY_DIR}/qthelp/extra-cmake-modules.qhcp
     71            ${CMAKE_CURRENT_BINARY_DIR}/qthelp/ExtraCMakeModules.qhcp
    7172    )
    7273endif()
    7374
    … … if(BUILD_HTML_DOCS) 
    122123endif()
    123124if(BUILD_QTHELP_DOCS)
    124125    install(
    125         FILES ${CMAKE_CURRENT_BINARY_DIR}/qthelp/extra-cmake-modules.qch
     126        FILES ${CMAKE_CURRENT_BINARY_DIR}/qthelp/ExtraCMakeModules.qch
    126127        DESTINATION ${DOC_INSTALL_DIR}
    127128    )
    128129endif()