[Cmake-commits] CMake branch, next, updated. v3.2.1-1178-g67f80c3

[Gregor Jasny]

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  67f80c3e1ba9987369297a37f26fda680b9f9d6c (commit)
       via  840f5b89a456b6f68a9b75c7a0a0bfc3fa37e643 (commit)
      from  3a18de5bd9d27acd50c4a117bf8e654a37c56a9c (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=67f80c3e1ba9987369297a37f26fda680b9f9d6c
commit 67f80c3e1ba9987369297a37f26fda680b9f9d6c
Merge: 3a18de5 840f5b8
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Mon Mar 23 12:56:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 23 12:56:03 2015 -0400

    Merge topic 'install-sphinx-object-mapping' into next
    
    840f5b89 Help: Install Sphinx HTML object mapping file


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=840f5b89a456b6f68a9b75c7a0a0bfc3fa37e643
commit 840f5b89a456b6f68a9b75c7a0a0bfc3fa37e643
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Mar 22 11:50:53 2015 +0100
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Sun Mar 22 11:50:53 2015 +0100

    Help: Install Sphinx HTML object mapping file
    
    To link CMake documentation from other documentation sets
    like KDE extra-cmake-modules the intersphinx extension depends
    on the objects.inv mapping file. The size overhead of 14k seems
    to be neglectable.
    
    Signed-off-by: Gregor Jasny <gjasny at googlemail.com>

diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index a58604e..da81752 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -159,7 +159,6 @@ if(SPHINX_HTML)
   install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
           DESTINATION ${CMAKE_DOC_DIR}
           PATTERN .buildinfo EXCLUDE
-          PATTERN objects.inv EXCLUDE
           )
 endif()
 
@@ -167,7 +166,6 @@ if(SPHINX_SINGLEHTML)
   install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/singlehtml
           DESTINATION ${CMAKE_DOC_DIR}
           PATTERN .buildinfo EXCLUDE
-          PATTERN objects.inv EXCLUDE
           )
 endif()
 

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

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


hooks/post-receive
-- 
CMake