summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-10-30 18:11:53 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-10-30 18:11:53 (GMT)
commit927b59403fe522d02308c7c5cc14d0c9d14f5b21 (patch)
treee22ada015b74db45c2f2d79d9a91333162fce691
parent6e1e7dd01499d11ae949f73b061dedf3bae7b6a9 (diff)
parentca83c39ce0732237c175f60e6d5b204ce5f907e7 (diff)
downloadCMake-927b59403fe522d02308c7c5cc14d0c9d14f5b21.zip
CMake-927b59403fe522d02308c7c5cc14d0c9d14f5b21.tar.gz
CMake-927b59403fe522d02308c7c5cc14d0c9d14f5b21.tar.bz2
Merge topic 'doc-fix-html-favicon'
ca83c39c Utilities/Sphinx: Fix html_favicon configuration
-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"