Merge topic 'qthelp_names'

111bb67c Help: Use a more-appropriate qthelp namespace and file name.
This commit is contained in:
Brad King 2014-04-11 09:13:12 -04:00 committed by CMake Topic Stage
commit 7ae139999b
3 changed files with 41 additions and 0 deletions

View File

@ -79,6 +79,11 @@ if(SPHINX_QTHELP)
# https://codereview.qt-project.org/#change,82250 in Qt 4. # https://codereview.qt-project.org/#change,82250 in Qt 4.
COMMAND ${CMAKE_COMMAND} "-DCSS_DIR=${CMAKE_CURRENT_BINARY_DIR}/qthelp/_static" COMMAND ${CMAKE_COMMAND} "-DCSS_DIR=${CMAKE_CURRENT_BINARY_DIR}/qthelp/_static"
-P "${CMAKE_CURRENT_SOURCE_DIR}/apply_qthelp_css_workaround.cmake" -P "${CMAKE_CURRENT_SOURCE_DIR}/apply_qthelp_css_workaround.cmake"
# Workaround sphinx configurability:
# https://bitbucket.org/birkenfeld/sphinx/issue/1448/make-qthelp-more-configurable
COMMAND ${CMAKE_COMMAND} "-DQTHELP_DIR=${CMAKE_CURRENT_BINARY_DIR}/qthelp/"
"-DCMake_VERSION=${CMake_VERSION_MAJOR}${CMake_VERSION_MINOR}${CMake_VERSION_PATCH}"
-P "${CMAKE_CURRENT_SOURCE_DIR}/fixup_qthelp_names.cmake"
COMMAND qcollectiongenerator ${CMAKE_CURRENT_BINARY_DIR}/qthelp/CMake.qhcp COMMAND qcollectiongenerator ${CMAKE_CURRENT_BINARY_DIR}/qthelp/CMake.qhcp
) )
endif() endif()

View File

@ -61,3 +61,7 @@ html_theme = 'default'
html_title = 'CMake %s Documentation' % release html_title = 'CMake %s Documentation' % release
html_short_title = '%s Documentation' % release html_short_title = '%s Documentation' % release
html_favicon = 'cmake-favicon.ico' html_favicon = 'cmake-favicon.ico'
# Not supported yet by sphinx:
# https://bitbucket.org/birkenfeld/sphinx/issue/1448/make-qthelp-more-configurable
# qthelp_namespace = "org.cmake"
# qthelp_qch_name = "CMake-300.qch"

View File

@ -0,0 +1,32 @@
file(READ "${QTHELP_DIR}/CMake.qhcp" QHCP_CONTENT)
string(REPLACE
"<homePage>qthelp://org.sphinx.cmake" "<homePage>qthelp://org.cmake"
QHCP_CONTENT "${QHCP_CONTENT}"
)
string(REPLACE
"<startPage>qthelp://org.sphinx.cmake" "<startPage>qthelp://org.cmake"
QHCP_CONTENT "${QHCP_CONTENT}"
)
string(REPLACE
"<output>CMake.qch" "<output>CMake-${CMake_VERSION}.qch"
QHCP_CONTENT "${QHCP_CONTENT}"
)
string(REPLACE
"<file>CMake.qch" "<file>CMake-${CMake_VERSION}.qch"
QHCP_CONTENT "${QHCP_CONTENT}"
)
file(WRITE "${QTHELP_DIR}/CMake.qhcp" "${QHCP_CONTENT}")
file(READ "${QTHELP_DIR}/CMake.qhp" QHP_CONTENT)
string(REPLACE
"<namespace>org.sphinx.cmake" "<namespace>org.cmake"
QHP_CONTENT "${QHP_CONTENT}"
)
file(WRITE "${QTHELP_DIR}/CMake.qhp" "${QHP_CONTENT}")