diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-29 08:52:19 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-07-29 08:52:19 -0400 |
| commit | b5728f555d88fff4b014c44d4ebd4860980dbdbe (patch) | |
| tree | 4c0b834964a590a4d3f0bf772b7e31be0f8797b0 /Utilities | |
| parent | 05d064fec3ad47a39ac62f9a579472aa238c3f24 (diff) | |
| parent | 9e5e7e71c5b34f442be4008daf7be7e33438556a (diff) | |
| download | cmake-b5728f555d88fff4b014c44d4ebd4860980dbdbe.tar.gz | |
Merge topic 'fix-qthelp-windows'
9e5e7e71 Help: Fix QtHelp commands on Windows
Diffstat (limited to 'Utilities')
| -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 fd8cda90bc..a58604ece8 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() |