diff options
| author | Nils Gladitz <nilsgladitz@gmail.com> | 2014-07-28 19:07:53 (GMT) |
|---|---|---|
| committer | Nils Gladitz <nilsgladitz@gmail.com> | 2014-07-28 19:07:53 (GMT) |
| commit | 9e5e7e71c5b34f442be4008daf7be7e33438556a (patch) | |
| tree | eafeb24bb62df6119cc259ba1a8413275a130465 /Utilities/Sphinx | |
| parent | f188845237cdfee74dae0658888a61c855e285b3 (diff) | |
| download | CMake-9e5e7e71c5b34f442be4008daf7be7e33438556a.zip CMake-9e5e7e71c5b34f442be4008daf7be7e33438556a.tar.gz CMake-9e5e7e71c5b34f442be4008daf7be7e33438556a.tar.bz2 | |
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.
Diffstat (limited to 'Utilities/Sphinx')
| -rw-r--r-- | Utilities/Sphinx/CMakeLists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt index fd8cda9..a58604e 100644 --- a/Utilities/Sphinx/CMakeLists.txt +++ b/Utilities/Sphinx/CMakeLists.txt @@ -69,6 +69,8 @@ if(SPHINX_TEXT) list(APPEND doc_formats text) endif() if(SPHINX_QTHELP) + find_package(PythonInterp REQUIRED) + find_program(QCOLLECTIONGENERATOR_EXECUTABLE NAMES qcollectiongenerator DOC "qcollectiongenerator tool" @@ -91,9 +93,12 @@ if(SPHINX_QTHELP) # Create proper identifiers. Workaround 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() |