[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2282-g1b5ea23

[Stephen Kelly]

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, next has been updated
       via  1b5ea23ec46b875e558773d6ec90d71d959ae44d (commit)
       via  6578508ca31f8394b5c04b1fa70260e917643bf6 (commit)
      from  5e47058f09a808c939200ddd75fce747a17574a4 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b5ea23ec46b875e558773d6ec90d71d959ae44d
commit 1b5ea23ec46b875e558773d6ec90d71d959ae44d
Merge: 5e47058 6578508
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 14 07:16:01 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 14 07:16:01 2014 -0400

    Merge topic 'fix-qthelp-installation' into next
    
    6578508c Help: Fix installation of the Qt qch file.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6578508ca31f8394b5c04b1fa70260e917643bf6
commit 6578508ca31f8394b5c04b1fa70260e917643bf6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 14 13:14:31 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Apr 14 13:14:31 2014 +0200

    Help: Fix installation of the Qt qch file.
    
    The file was changed to have the version in its name in
    commit 111bb67c (Help: Use a more-appropriate qthelp namespace and
    file name., 2014-04-10).

diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index 0ae67bd..132ce60 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -149,7 +149,7 @@ if(SPHINX_HTML)
           )
 endif()
 if(SPHINX_QTHELP)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qthelp/CMake.qch
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qthelp/CMake-${CMake_VERSION_MAJOR}${CMake_VERSION_MINOR}${CMake_VERSION_PATCH}.qch
           DESTINATION ${CMAKE_DOC_DIR}
           )
 endif()

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

Summary of changes:
 Utilities/Sphinx/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake