[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7302-g29c4543
Brad King
brad.king at kitware.com
Tue Jan 28 09:13:45 EST 2014
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 29c45433c4ce11f6b1ddb561001b00598f1be6d0 (commit)
via 0c3cf36b3a1388bb9c3a718350c80eae0a41119d (commit)
from 84feb1f1b29d681878a5f61cf0f813076737cb26 (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=29c45433c4ce11f6b1ddb561001b00598f1be6d0
commit 29c45433c4ce11f6b1ddb561001b00598f1be6d0
Merge: 84feb1f 0c3cf36
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 28 09:13:45 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 28 09:13:45 2014 -0500
Merge topic 'doc-install-no-build-info' into next
0c3cf36b Help: Do not install Sphinx html build info files
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c3cf36b3a1388bb9c3a718350c80eae0a41119d
commit 0c3cf36b3a1388bb9c3a718350c80eae0a41119d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 28 09:12:44 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 28 09:12:44 2014 -0500
Help: Do not install Sphinx html build info files
Exclude '.buildinfo' and 'objects.inv' from installation as part
of the Sphinx-generated html documentation.
diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index aa9735e..c60788f 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -111,5 +111,8 @@ endif()
if(SPHINX_HTML)
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
- DESTINATION ${CMAKE_DOC_DIR})
+ DESTINATION ${CMAKE_DOC_DIR}
+ PATTERN .buildinfo EXCLUDE
+ PATTERN objects.inv EXCLUDE
+ )
endif()
-----------------------------------------------------------------------
Summary of changes:
Utilities/Sphinx/CMakeLists.txt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list