[Cmake-commits] CMake branch, next, updated. v3.2.2-2347-gae442cb
Brad King
brad.king at kitware.com
Thu Apr 30 09:53:46 EDT 2015
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 ae442cb571fa32b73ddfa60a8b0dc879b1035214 (commit)
via dd107b30d26b2cdaa5b1766f733428f3c4c7cd42 (commit)
via 6064b9072c480845b2ba61291e467b42cb500fe6 (commit)
from 1ed4af35ab4d811ca4bc2a75b5f44facec597f2c (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=ae442cb571fa32b73ddfa60a8b0dc879b1035214
commit ae442cb571fa32b73ddfa60a8b0dc879b1035214
Merge: 1ed4af3 dd107b3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 30 09:53:45 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 30 09:53:45 2015 -0400
Merge topic 'sphinx-options' into next
dd107b30 Add option to pass custom flags to sphinx-build (#15545)
6064b907 bootstrap: Fix SPHINX_{MAN,HTML,QTHELP} cache entry type
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd107b30d26b2cdaa5b1766f733428f3c4c7cd42
commit dd107b30d26b2cdaa5b1766f733428f3c4c7cd42
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 30 09:30:14 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 30 09:41:31 2015 -0400
Add option to pass custom flags to sphinx-build (#15545)
Create a SPHINX_FLAGS cache entry that users can populate with
command-line flags for sphinx-build. Add an option to the
bootstrap script to populate it up front.
Suggested-by: Felix Geyer <debfx at ubuntu.com>
diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index da81752..a755ca1 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -31,8 +31,11 @@ find_program(SPHINX_EXECUTABLE
NAMES sphinx-build
DOC "Sphinx Documentation Builder (sphinx-doc.org)"
)
+set(SPHINX_FLAGS "" CACHE STRING "Flags to pass to sphinx-build")
+separate_arguments(sphinx_flags UNIX_COMMAND "${SPHINX_FLAGS}")
mark_as_advanced(SPHINX_TEXT)
+mark_as_advanced(SPHINX_FLAGS)
if(NOT SPHINX_MAN AND NOT SPHINX_HTML AND NOT SPHINX_SINGLEHTML AND NOT SPHINX_QTHELP AND NOT SPHINX_TEXT)
return()
@@ -114,6 +117,7 @@ foreach(format ${doc_formats})
-c ${CMAKE_CURRENT_BINARY_DIR}
-d ${CMAKE_CURRENT_BINARY_DIR}/doctrees
-b ${format}
+ ${sphinx_flags}
${CMake_SOURCE_DIR}/Help
${CMAKE_CURRENT_BINARY_DIR}/${format}
> ${doc_format_log} # log stdout, pass stderr
diff --git a/bootstrap b/bootstrap
index 00b51b5..14046ee 100755
--- a/bootstrap
+++ b/bootstrap
@@ -74,6 +74,7 @@ cmake_sphinx_man=""
cmake_sphinx_html=""
cmake_sphinx_qthelp=""
cmake_sphinx_build=""
+cmake_sphinx_flags=""
# Determine whether this is a Cygwin environment.
if echo "${cmake_system}" | grep CYGWIN >/dev/null 2>&1; then
@@ -423,6 +424,7 @@ Configuration:
--sphinx-html build html help with Sphinx
--sphinx-qthelp build qch help with Sphinx
--sphinx-build=<sb> use <sb> as the sphinx-build executable
+ --sphinx-flags=<flags> pass <flags> to sphinx-build executable
Directory and file names:
--prefix=PREFIX install files in tree rooted at PREFIX
@@ -660,6 +662,7 @@ while test $# != 0; do
--sphinx-html) cmake_sphinx_html="1" ;;
--sphinx-qthelp) cmake_sphinx_qthelp="1" ;;
--sphinx-build=*) cmake_sphinx_build=`cmake_arg "$1"` ;;
+ --sphinx-flags=*) cmake_sphinx_flags=`cmake_arg "$1"` ;;
--help) cmake_usage ;;
--version) cmake_version_display ; exit 2 ;;
--verbose) cmake_verbose=TRUE ;;
@@ -1684,6 +1687,11 @@ if [ "x${cmake_sphinx_build}" != "x" ]; then
set (SPHINX_EXECUTABLE "'"${cmake_sphinx_build}"'" CACHE FILEPATH "Location of Qt sphinx-build" FORCE)
' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
fi
+if [ "x${cmake_sphinx_flags}" != "x" ]; then
+ echo '
+set (SPHINX_FLAGS [==['"${cmake_sphinx_flags}"']==] CACHE STRING "Flags to pass to sphinx-build" FORCE)
+' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
+fi
# Add user-specified settings. Handle relative-path case for
# specification of cmake_init_file.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6064b9072c480845b2ba61291e467b42cb500fe6
commit 6064b9072c480845b2ba61291e467b42cb500fe6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 30 09:22:43 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 30 09:22:43 2015 -0400
bootstrap: Fix SPHINX_{MAN,HTML,QTHELP} cache entry type
These cache entries should be generated with type BOOL, not FILEPATH.
diff --git a/bootstrap b/bootstrap
index ad02a82..00b51b5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1666,17 +1666,17 @@ set (QT_QMAKE_EXECUTABLE "'"${cmake_bootstrap_qt_qmake}"'" CACHE FILEPATH "Locat
fi
if [ "x${cmake_sphinx_man}" != "x" ]; then
echo '
-set (SPHINX_MAN "'"${cmake_sphinx_man}"'" CACHE FILEPATH "Build man pages with Sphinx" FORCE)
+set (SPHINX_MAN "'"${cmake_sphinx_man}"'" CACHE BOOL "Build man pages with Sphinx" FORCE)
' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
fi
if [ "x${cmake_sphinx_html}" != "x" ]; then
echo '
-set (SPHINX_HTML "'"${cmake_sphinx_html}"'" CACHE FILEPATH "Build html help with Sphinx" FORCE)
+set (SPHINX_HTML "'"${cmake_sphinx_html}"'" CACHE BOOL "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)
+set (SPHINX_QTHELP "'"${cmake_sphinx_qthelp}"'" CACHE BOOL "Build qch help with Sphinx" FORCE)
' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
fi
if [ "x${cmake_sphinx_build}" != "x" ]; then
-----------------------------------------------------------------------
Summary of changes:
Utilities/Sphinx/CMakeLists.txt | 4 ++++
bootstrap | 14 +++++++++++---
2 files changed, 15 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list