[Cmake-commits] CMake branch, master, updated. v3.15.0-rc4-340-g74ad28f

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  74ad28fa6a05d033eb99db949eb095fc192c34ad (commit)
       via  0518e675eaa4fa7e539f4e1ec9cd7f3a40b3a0da (commit)
      from  3143e9ffc5fcb15a9c0c1a7cfaa94587132947d1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74ad28fa6a05d033eb99db949eb095fc192c34ad
commit 74ad28fa6a05d033eb99db949eb095fc192c34ad
Merge: 3143e9f 0518e67
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 17 11:49:04 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jul 17 07:49:12 2019 -0400

    Merge topic 'cmake-qch-no-version-in-filename'
    
    0518e675ea CMake.qch: Don't include the version in the file name
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3558


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0518e675eaa4fa7e539f4e1ec9cd7f3a40b3a0da
commit 0518e675eaa4fa7e539f4e1ec9cd7f3a40b3a0da
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Tue Jul 16 23:25:46 2019 +1000
Commit:     Craig Scott <craig.scott at crascit.com>
CommitDate: Wed Jul 17 21:35:12 2019 +1000

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

diff --git a/Help/release/dev/cmake-qch-no-version-in-filename.rst b/Help/release/dev/cmake-qch-no-version-in-filename.rst
new file mode 100644
index 0000000..3c5cb04
--- /dev/null
+++ b/Help/release/dev/cmake-qch-no-version-in-filename.rst
@@ -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.
diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index c5b2bfe..e4e6e05 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -105,7 +105,6 @@ if(SPHINX_QTHELP)
     # 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"
 
     # Create proper identifiers. Workaround for
@@ -216,7 +215,7 @@ endif()
 
 if(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}
           )
 endif()
diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in
index 70ba080..e50c4f9 100644
--- a/Utilities/Sphinx/conf.py.in
+++ b/Utilities/Sphinx/conf.py.in
@@ -82,4 +82,4 @@ html_favicon = '@conf_path@/static/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"
+# qthelp_qch_name = "CMake.qch"
diff --git a/Utilities/Sphinx/fixup_qthelp_names.cmake b/Utilities/Sphinx/fixup_qthelp_names.cmake
index e35ef25..179e846 100644
--- a/Utilities/Sphinx/fixup_qthelp_names.cmake
+++ b/Utilities/Sphinx/fixup_qthelp_names.cmake
@@ -10,15 +10,6 @@ string(REPLACE
   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}")
 
 

-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/cmake-qch-no-version-in-filename.rst | 8 ++++++++
 Utilities/Sphinx/CMakeLists.txt                       | 3 +--
 Utilities/Sphinx/conf.py.in                           | 2 +-
 Utilities/Sphinx/fixup_qthelp_names.cmake             | 9 ---------
 4 files changed, 10 insertions(+), 12 deletions(-)
 create mode 100644 Help/release/dev/cmake-qch-no-version-in-filename.rst


hooks/post-receive
-- 
CMake