kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Help: Fix QtHelp commands on Windows 

Explicitly invoke python script through the interpreter since
windows does not act on hashbangs.
Use the found qcollectiongenerator executable rather than what
happens to be in PATH.
This commit is contained in:
Nils Gladitz 2014-07-28 21:07:53 +02:00
parent f188845237
commit 9e5e7e71c5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Utilities/Sphinx/CMakeLists.txt
View File

@ -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()