summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-11-07 14:52:46 (GMT)
committerBrad King <brad.king@kitware.com>2014-11-07 14:52:46 (GMT)
commit51bb383dbf6de9f46d7784a0d3e0bc845a85a0a3 (patch)
treea0505614fbd9a9047a2612ba8b6573332386f5f2
parent4cc2d9b3a600b01259006f4ca4dd72f77a55da90 (diff)
parent5088e0a0488a913a1ae1f011584bd5ad8d5e7b18 (diff)
downloadCMake-51bb383dbf6de9f46d7784a0d3e0bc845a85a0a3.zip
CMake-51bb383dbf6de9f46d7784a0d3e0bc845a85a0a3.tar.gz
CMake-51bb383dbf6de9f46d7784a0d3e0bc845a85a0a3.tar.bz2
Merge branch 'doc-fix-html-favicon' into release
-rw-r--r--Utilities/Sphinx/conf.py.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in
index d81bbcf..fc26790 100644
--- a/Utilities/Sphinx/conf.py.in
+++ b/Utilities/Sphinx/conf.py.in
@@ -60,7 +60,7 @@ html_style = 'cmake.css'
html_theme = 'default'
html_title = 'CMake %s Documentation' % release
html_short_title = '%s Documentation' % release
-html_favicon = 'cmake-favicon.ico'
+html_favicon = '@conf_path@/static/cmake-favicon.ico'
# Not supported yet by sphinx:
# https://bitbucket.org/birkenfeld/sphinx/issue/1448/make-qthelp-more-configurable
# qthelp_namespace = "org.cmake"