[Cmake-commits] CMake branch, next, updated. v3.0.0-4555-g2a4a4c3

[Nils Gladitz]

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  2a4a4c3f152c7de8ca4cf13170d0ddbfdb587274 (commit)
       via  9e5e7e71c5b34f442be4008daf7be7e33438556a (commit)
      from  e5c672d0d46ee61ccd9c789ba0aaf0c20916b567 (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=2a4a4c3f152c7de8ca4cf13170d0ddbfdb587274
commit 2a4a4c3f152c7de8ca4cf13170d0ddbfdb587274
Merge: e5c672d 9e5e7e7
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Jul 28 15:08:52 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 28 15:08:52 2014 -0400

    Merge topic 'fix-qthelp-windows' into next
    
    9e5e7e71 Help: Fix QtHelp commands on Windows


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e5e7e71c5b34f442be4008daf7be7e33438556a
commit 9e5e7e71c5b34f442be4008daf7be7e33438556a
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Jul 28 21:07:53 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Jul 28 21:07:53 2014 +0200

    Help: Fix QtHelp commands on Windows
    
    Explicitly invoke python script through the interpreter since
    windows does not act on hashbangs.
    Use the found qcollectiongenerator executable rather than what
    happens to be in PATH.

diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index fd8cda9..a58604e 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()
 

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

Summary of changes:
 Utilities/Sphinx/CMakeLists.txt |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake