Merge topic 'fix-qthelp-windows'
9e5e7e71
Help: Fix QtHelp commands on Windows
This commit is contained in:
commit
b5728f555d
|
@ -69,6 +69,8 @@ if(SPHINX_TEXT)
|
||||||
list(APPEND doc_formats text)
|
list(APPEND doc_formats text)
|
||||||
endif()
|
endif()
|
||||||
if(SPHINX_QTHELP)
|
if(SPHINX_QTHELP)
|
||||||
|
find_package(PythonInterp REQUIRED)
|
||||||
|
|
||||||
find_program(QCOLLECTIONGENERATOR_EXECUTABLE
|
find_program(QCOLLECTIONGENERATOR_EXECUTABLE
|
||||||
NAMES qcollectiongenerator
|
NAMES qcollectiongenerator
|
||||||
DOC "qcollectiongenerator tool"
|
DOC "qcollectiongenerator tool"
|
||||||
|
@ -91,9 +93,12 @@ if(SPHINX_QTHELP)
|
||||||
|
|
||||||
# Create proper identifiers. Workaround for
|
# Create proper identifiers. Workaround for
|
||||||
# https://bitbucket.org/birkenfeld/sphinx/issue/1491/qthelp-should-generate-identifiers-for
|
# https://bitbucket.org/birkenfeld/sphinx/issue/1491/qthelp-should-generate-identifiers-for
|
||||||
COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/create_identifiers.py" "${CMAKE_CURRENT_BINARY_DIR}/qthelp/"
|
COMMAND "${PYTHON_EXECUTABLE}"
|
||||||
|
"${CMAKE_CURRENT_SOURCE_DIR}/create_identifiers.py"
|
||||||
|
"${CMAKE_CURRENT_BINARY_DIR}/qthelp/"
|
||||||
|
|
||||||
COMMAND qcollectiongenerator ${CMAKE_CURRENT_BINARY_DIR}/qthelp/CMake.qhcp
|
COMMAND ${QCOLLECTIONGENERATOR_EXECUTABLE}
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}/qthelp/CMake.qhcp
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue