[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-550-ga0c0287

[Brad King]

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  a0c0287177e9ee3f34a92aec3f70efc9f64b159f (commit)
       via  a65068240e11dc6f9cc29b0edd018c6a2f4cb560 (commit)
      from  cdd1d35961dff13c522e72ed4730f4407410f9dd (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=a0c0287177e9ee3f34a92aec3f70efc9f64b159f
commit a0c0287177e9ee3f34a92aec3f70efc9f64b159f
Merge: cdd1d35 a650682
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 12 09:10:44 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 12 09:10:44 2014 -0500

    Merge topic 'doc-index-xrefs' into next
    
    a6506824 Utilities/Sphinx: Fix qthelp generation for indexed cross-references


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a65068240e11dc6f9cc29b0edd018c6a2f4cb560
commit a65068240e11dc6f9cc29b0edd018c6a2f4cb560
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 12 09:09:55 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 12 09:09:55 2014 -0500

    Utilities/Sphinx: Fix qthelp generation for indexed cross-references

diff --git a/Utilities/Sphinx/create_identifiers.py b/Utilities/Sphinx/create_identifiers.py
index 7715e53..3fe3fcb 100755
--- a/Utilities/Sphinx/create_identifiers.py
+++ b/Utilities/Sphinx/create_identifiers.py
@@ -34,7 +34,7 @@ for line in lines:
 
   for domain_object_string, domain_object_type in mapping:
     if "<keyword name=\"" + domain_object_string + "\"" in line:
-      if not "id=\"" in line:
+      if not "id=\"" in line and not "#index-" in line:
         prefix = "<keyword name=\"" + domain_object_string + "\" "
         part1, part2 = line.split(prefix)
         head, tail = part2.split("#" + domain_object_type + ":")

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

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


hooks/post-receive
-- 
CMake