summaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-11 14:59:24 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-02-11 14:59:24 (GMT)
commitf3c0c6140360d0591c5163e7a3fcdf0040f4690f (patch)
tree10710b1d8b102436a5ae10541704bd4c90dbbf3b /bootstrap
parentdcc5de9c4b7dbc17229d9f11aee978f6828d932d (diff)
parent85fd62ee91b7a8dcb929eee36424886bd0b59592 (diff)
downloadCMake-f3c0c6140360d0591c5163e7a3fcdf0040f4690f.zip
CMake-f3c0c6140360d0591c5163e7a3fcdf0040f4690f.tar.gz
CMake-f3c0c6140360d0591c5163e7a3fcdf0040f4690f.tar.bz2
Merge topic 'bootstrap-sphinx-qthelp'
85fd62ee bootstrap: Add --sphinx-qthelp option to enable qthelp doc generation
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap8
1 files changed, 8 insertions, 0 deletions
diff --git a/bootstrap b/bootstrap
index 8e22bee..d291327 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.
@@ -413,6 +414,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:
@@ -649,6 +651,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 ;;
@@ -1664,6 +1667,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)