[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1031-ge538607

[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  e53860733e9868ceb85771e78111c586eac92a0f (commit)
       via  e59a7d7ec541f588335974bd00efb0e6275c308b (commit)
      from  87deaee2e45dfc626c4d6883dfbaeca83448556d (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=e53860733e9868ceb85771e78111c586eac92a0f
commit e53860733e9868ceb85771e78111c586eac92a0f
Merge: 87deaee e59a7d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 14 11:25:28 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 14 11:25:28 2015 -0400

    Merge topic 'sphinx-classic-theme' into next
    
    e59a7d7e Utilities/Sphinx: Use 'classic' theme for Sphinx >= 1.3


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e59a7d7ec541f588335974bd00efb0e6275c308b
commit e59a7d7ec541f588335974bd00efb0e6275c308b
Author:     Andrew Maclean <andrew.amaclean at gmail.com>
AuthorDate: Tue Jul 14 12:10:07 2015 +1000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 14 11:22:02 2015 -0400

    Utilities/Sphinx: Use 'classic' theme for Sphinx >= 1.3
    
    Sphinx 1.3 renamed the "default" theme to "classic".
    
    Signed-off-by: Andrew Maclean <andrew.amaclean at gmail.com>

diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in
index eb24a6e..179ff5b 100644
--- a/Utilities/Sphinx/conf.py.in
+++ b/Utilities/Sphinx/conf.py.in
@@ -13,6 +13,7 @@ import sys
 import os
 import re
 import glob
+from sphinx import version_info
 
 sys.path.insert(0, r'@conf_path@')
 
@@ -59,7 +60,11 @@ man_show_urls = False
 html_show_sourcelink = True
 html_static_path = ['@conf_path@/static']
 html_style = 'cmake.css'
-html_theme = 'default'
+if isinstance(version_info, tuple) and \
+   (version_info[0]*100 + version_info[1]) > 102:
+    html_theme = 'classic'
+else:
+    html_theme = 'default'
 html_title = 'CMake %s Documentation' % release
 html_short_title = '%s Documentation' % release
 html_favicon = '@conf_path@/static/cmake-favicon.ico'

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

Summary of changes:
 Utilities/Sphinx/conf.py.in |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake