[Cmake-commits] CMake branch, next, updated. v3.1.2-1167-g0f422f3

[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  0f422f38cb7532af36b6d0a080dcf5ef4ff77748 (commit)
       via  85fd62ee91b7a8dcb929eee36424886bd0b59592 (commit)
      from  5b19ac52bb4db11dd932c2f522cdda25a19a2ba3 (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=0f422f38cb7532af36b6d0a080dcf5ef4ff77748
commit 0f422f38cb7532af36b6d0a080dcf5ef4ff77748
Merge: 5b19ac5 85fd62e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 10:07:28 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 10:07:28 2015 -0500

    Merge topic 'bootstrap-sphinx-qthelp' into next
    
    85fd62ee bootstrap: Add --sphinx-qthelp option to enable qthelp doc generation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85fd62ee91b7a8dcb929eee36424886bd0b59592
commit 85fd62ee91b7a8dcb929eee36424886bd0b59592
Author:     Nuno Sucena Almeida <nuno at aeminium.org>
AuthorDate: Sat Feb 7 17:23:28 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 10 10:03:10 2015 -0500

    bootstrap: Add --sphinx-qthelp option to enable qthelp doc generation

diff --git a/bootstrap b/bootstrap
index a88eb6a..e7d0496 100755
--- a/bootstrap
+++ b/bootstrap
@@ -72,6 +72,7 @@ cmake_bootstrap_qt_gui=""
 cmake_bootstrap_qt_qmake=""
 cmake_sphinx_man=""
 cmake_sphinx_html=""
+cmake_sphinx_qthelp=""
 cmake_sphinx_build=""
 
 # Determine whether this is a Cygwin environment.
@@ -410,6 +411,7 @@ Configuration:
 
   --sphinx-man            build man pages with Sphinx
   --sphinx-html           build html help with Sphinx
+  --sphinx-qthelp         build qch help with Sphinx
   --sphinx-build=<sb>     use <sb> as the sphinx-build executable
 
 Directory and file names:
@@ -646,6 +648,7 @@ while test $# != 0; do
   --qt-qmake=*) cmake_bootstrap_qt_qmake=`cmake_arg "$1"` ;;
   --sphinx-man) cmake_sphinx_man="1" ;;
   --sphinx-html) cmake_sphinx_html="1" ;;
+  --sphinx-qthelp) cmake_sphinx_qthelp="1" ;;
   --sphinx-build=*) cmake_sphinx_build=`cmake_arg "$1"` ;;
   --help) cmake_usage ;;
   --version) cmake_version_display ; exit 2 ;;
@@ -1661,6 +1664,11 @@ if [ "x${cmake_sphinx_html}" != "x" ]; then
 set (SPHINX_HTML "'"${cmake_sphinx_html}"'" CACHE FILEPATH "Build html help with Sphinx" FORCE)
 ' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
 fi
+if [ "x${cmake_sphinx_qthelp}" != "x" ]; then
+  echo '
+set (SPHINX_QTHELP "'"${cmake_sphinx_qthelp}"'" CACHE FILEPATH "Build qch help with Sphinx" FORCE)
+' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
+fi
 if [ "x${cmake_sphinx_build}" != "x" ]; then
   echo '
 set (SPHINX_EXECUTABLE "'"${cmake_sphinx_build}"'" CACHE FILEPATH "Location of Qt sphinx-build" FORCE)

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

Summary of changes:
 bootstrap |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake