[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2551-g0e76aa9

[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  0e76aa9382d26a5edab07764189d6fdea0fd4947 (commit)
       via  aaa6c8a6cefff2fc8938453f09fb91523b9e87e4 (commit)
       via  faf291a9c41cc2a4ffa6797c1d35c7863118a4c4 (commit)
      from  0827bda6bf320de54aa9482b6c609d0944b93a6f (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=0e76aa9382d26a5edab07764189d6fdea0fd4947
commit 0e76aa9382d26a5edab07764189d6fdea0fd4947
Merge: 0827bda aaa6c8a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 24 15:36:19 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 24 15:36:19 2014 -0400

    Merge topic 'doc-singlehtml' into next
    
    aaa6c8a6 Merge branch 'master' into doc-singlehtml
    faf291a9 Utilities/Sphinx: Add option to build 'singlehtml' format


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aaa6c8a6cefff2fc8938453f09fb91523b9e87e4
commit aaa6c8a6cefff2fc8938453f09fb91523b9e87e4
Merge: faf291a d64ee80
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 24 15:31:45 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 24 15:31:45 2014 -0400

    Merge branch 'master' into doc-singlehtml
    
    Resolve conflicts in Utilities/Sphinx/CMakeLists.txt by adding the help
    options from both sides.

diff --cc Utilities/Sphinx/CMakeLists.txt
index 5e3e04b,132ce60..951f7ab
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@@ -24,7 -24,7 +24,8 @@@ project(CMakeHelp NONE
  
  option(SPHINX_MAN "Build man pages with Sphinx" OFF)
  option(SPHINX_HTML "Build html help with Sphinx" OFF)
 +option(SPHINX_SINGLEHTML "Build html single page help with Sphinx" OFF)
+ option(SPHINX_QTHELP "Build Qt help with Sphinx" OFF)
  option(SPHINX_TEXT "Build text help with Sphinx (not installed)" OFF)
  find_program(SPHINX_EXECUTABLE
    NAMES sphinx-build
@@@ -33,7 -33,7 +34,7 @@@
  
  mark_as_advanced(SPHINX_TEXT)
  
- if(NOT SPHINX_MAN AND NOT SPHINX_HTML AND NOT SPHINX_SINGLEHTML AND NOT SPHINX_TEXT)
 -if(NOT SPHINX_MAN AND NOT SPHINX_HTML AND NOT SPHINX_QTHELP AND NOT SPHINX_TEXT)
++if(NOT SPHINX_MAN AND NOT SPHINX_HTML AND NOT SPHINX_SINGLEHTML AND NOT SPHINX_QTHELP AND NOT SPHINX_TEXT)
    return()
  elseif(NOT SPHINX_EXECUTABLE)
    message(FATAL_ERROR "SPHINX_EXECUTABLE (sphinx-build) is not found!")
@@@ -126,11 -148,8 +152,17 @@@ if(SPHINX_HTML
            PATTERN objects.inv EXCLUDE
            )
  endif()
 +
 +if(SPHINX_SINGLEHTML)
 +  install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/singlehtml
 +          DESTINATION ${CMAKE_DOC_DIR}
 +          PATTERN .buildinfo EXCLUDE
 +          PATTERN objects.inv EXCLUDE
 +          )
 +endif()
++
+ if(SPHINX_QTHELP)
+   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qthelp/CMake-${CMake_VERSION_MAJOR}${CMake_VERSION_MINOR}${CMake_VERSION_PATCH}.qch
+           DESTINATION ${CMAKE_DOC_DIR}
+           )
+ endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=faf291a9c41cc2a4ffa6797c1d35c7863118a4c4
commit faf291a9c41cc2a4ffa6797c1d35c7863118a4c4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 24 14:59:34 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 24 15:23:27 2014 -0400

    Utilities/Sphinx: Add option to build 'singlehtml' format
    
    Add SPHINX_SINGLEHTML to enable the Sphinx 'singlehtml' builder.

diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index 23dc6ae..5e3e04b 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -24,6 +24,7 @@ project(CMakeHelp NONE)
 
 option(SPHINX_MAN "Build man pages with Sphinx" OFF)
 option(SPHINX_HTML "Build html help with Sphinx" OFF)
+option(SPHINX_SINGLEHTML "Build html single page help with Sphinx" OFF)
 option(SPHINX_TEXT "Build text help with Sphinx (not installed)" OFF)
 find_program(SPHINX_EXECUTABLE
   NAMES sphinx-build
@@ -32,7 +33,7 @@ find_program(SPHINX_EXECUTABLE
 
 mark_as_advanced(SPHINX_TEXT)
 
-if(NOT SPHINX_MAN AND NOT SPHINX_HTML AND NOT SPHINX_TEXT)
+if(NOT SPHINX_MAN AND NOT SPHINX_HTML AND NOT SPHINX_SINGLEHTML AND NOT SPHINX_TEXT)
   return()
 elseif(NOT SPHINX_EXECUTABLE)
   message(FATAL_ERROR "SPHINX_EXECUTABLE (sphinx-build) is not found!")
@@ -60,6 +61,9 @@ endif()
 if(SPHINX_MAN)
   list(APPEND doc_formats man)
 endif()
+if(SPHINX_SINGLEHTML)
+  list(APPEND doc_formats singlehtml)
+endif()
 if(SPHINX_TEXT)
   list(APPEND doc_formats text)
 endif()
@@ -122,3 +126,11 @@ if(SPHINX_HTML)
           PATTERN objects.inv EXCLUDE
           )
 endif()
+
+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 |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake