mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-23 16:28:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

CMake.qch: Don't include the version in the file name

Browse Source 
Fixes: #19374
This commit is contained in:
Craig Scott
2019-07-16 23:25:46 +10:00
parent 79a21ba680
commit 0518e675ea
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Help/release/dev/cmake-qch-no-version-in-filename.rst
+8
View File
@@ -0,0 +1,8 @@
cmake-qch-no-version-in-filename
--------------------------------
* The Qt Compressed Help file is now named ``CMake.qch``, which no longer
contains the release version in the file name. When CMake is upgraded
in-place, the name and location of this file will remain constant.
Tools such as IDEs, help viewers, etc. should now be able to refer to this
file at a fixed location that remains valid across CMake upgrades.
Utilities/Sphinx/CMakeLists.txt
+1 -2
View File
@@ -105,7 +105,6 @@ if(SPHINX_QTHELP)
# Workaround sphinx configurability: # Workaround sphinx configurability:
# https://bitbucket.org/birkenfeld/sphinx/issue/1448/make-qthelp-more-configurable # https://bitbucket.org/birkenfeld/sphinx/issue/1448/make-qthelp-more-configurable
COMMAND ${CMAKE_COMMAND} "-DQTHELP_DIR=${CMAKE_CURRENT_BINARY_DIR}/qthelp/" 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" -P "${CMAKE_CURRENT_SOURCE_DIR}/fixup_qthelp_names.cmake"
# Create proper identifiers. Workaround for # Create proper identifiers. Workaround for
@@ -216,7 +215,7 @@ endif()
if(SPHINX_QTHELP) if(SPHINX_QTHELP)
CMake_OPTIONAL_COMPONENT(sphinx-qthelp) CMake_OPTIONAL_COMPONENT(sphinx-qthelp)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qthelp/CMake-${CMake_VERSION_MAJOR}${CMake_VERSION_MINOR}${CMake_VERSION_PATCH}.qch install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qthelp/CMake.qch
DESTINATION ${CMAKE_DOC_DIR} ${COMPONENT} DESTINATION ${CMAKE_DOC_DIR} ${COMPONENT}
) )
endif() endif()
Utilities/Sphinx/conf.py.in
+1 -1
View File
@@ -82,4 +82,4 @@ html_favicon = '@conf_path@/static/cmake-favicon.ico'
# Not supported yet by sphinx: # Not supported yet by sphinx:
# https://bitbucket.org/birkenfeld/sphinx/issue/1448/make-qthelp-more-configurable # https://bitbucket.org/birkenfeld/sphinx/issue/1448/make-qthelp-more-configurable
# qthelp_namespace = "org.cmake" # qthelp_namespace = "org.cmake"
# qthelp_qch_name = "CMake-300.qch" # qthelp_qch_name = "CMake.qch"
Utilities/Sphinx/fixup_qthelp_names.cmake
-9
View File
@@ -10,15 +10,6 @@ string(REPLACE
QHCP_CONTENT "${QHCP_CONTENT}" 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(WRITE "${QTHELP_DIR}/CMake.qhcp" "${QHCP_CONTENT}")