<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Aug 14, 2014 at 4:57 AM, Dan Liew <span dir="ltr"><<a href="mailto:dan@su-root.co.uk" target="_blank">dan@su-root.co.uk</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: delcypher<br>
Date: Thu Aug 14 06:57:13 2014<br>
New Revision: 215634<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=215634&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=215634&view=rev</a><br>
Log:<br>
Add SPHINX_WARNINGS_AS_ERRORS CMake option to allow warnings to not be<br>
treated as errors (which is still the default).</blockquote><div><br></div><div>This seems to contradict the patch, which seems to make -W the default (SPHINX_WARNINGS_AS_ERRORS=ON by default).</div><div><br></div><div>-- Sean Silva</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> This is useful when<br>
working on documentation that has existing errors.<br>
<br>
Modified:<br>
    llvm/trunk/cmake/modules/AddSphinxTarget.cmake<br>
    llvm/trunk/cmake/modules/FindSphinx.cmake<br>
    llvm/trunk/docs/CMake.rst<br>
<br>
Modified: llvm/trunk/cmake/modules/AddSphinxTarget.cmake<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddSphinxTarget.cmake?rev=215634&r1=215633&r2=215634&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddSphinxTarget.cmake?rev=215634&r1=215633&r2=215634&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/cmake/modules/AddSphinxTarget.cmake (original)<br>
+++ llvm/trunk/cmake/modules/AddSphinxTarget.cmake Thu Aug 14 06:57:13 2014<br>
@@ -8,12 +8,19 @@ function (add_sphinx_target builder proj<br>
   set(SPHINX_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/${builder}")<br>
   set(SPHINX_DOC_TREE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees")<br>
   set(SPHINX_TARGET_NAME docs-${project}-${builder})<br>
+<br>
+  if (SPHINX_WARNINGS_AS_ERRORS)<br>
+    set(SPHINX_WARNINGS_AS_ERRORS_FLAG "-W")<br>
+  else()<br>
+    set(SPHINX_WARNINGS_AS_ERRORS_FLAG "")<br>
+  endif()<br>
+<br>
   add_custom_target(${SPHINX_TARGET_NAME}<br>
                     COMMAND ${SPHINX_EXECUTABLE}<br>
                             -b ${builder}<br>
                             -d "${SPHINX_DOC_TREE_DIR}"<br>
                             -q # Quiet: no output other than errors and warnings.<br>
-                            -W # Warnings are errors.<br>
+                            ${SPHINX_WARNINGS_AS_ERRORS_FLAG} # Treat warnings as errors if requested<br>
                             "${CMAKE_CURRENT_SOURCE_DIR}" # Source<br>
                             "${SPHINX_BUILD_DIR}" # Output<br>
                     COMMENT<br>
<br>
Modified: llvm/trunk/cmake/modules/FindSphinx.cmake<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/FindSphinx.cmake?rev=215634&r1=215633&r2=215634&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/FindSphinx.cmake?rev=215634&r1=215633&r2=215634&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/cmake/modules/FindSphinx.cmake (original)<br>
+++ llvm/trunk/cmake/modules/FindSphinx.cmake Thu Aug 14 06:57:13 2014<br>
@@ -23,3 +23,5 @@ find_package_handle_standard_args(Sphinx<br>
 # Provide options for controlling different types of output<br>
 option(SPHINX_OUTPUT_HTML "Output standalone HTML files" ON)<br>
 option(SPHINX_OUTPUT_MAN "Output man pages" ON)<br>
+<br>
+option(SPHINX_WARNINGS_AS_ERRORS "When building documentation treat warnings as errors" ON)<br>
<br>
Modified: llvm/trunk/docs/CMake.rst<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CMake.rst?rev=215634&r1=215633&r2=215634&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CMake.rst?rev=215634&r1=215633&r2=215634&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/docs/CMake.rst (original)<br>
+++ llvm/trunk/docs/CMake.rst Thu Aug 14 06:57:13 2014<br>
@@ -363,6 +363,10 @@ LLVM-specific variables<br>
   is enabled). Currently the only target added is ``docs-llvm-man``. Defaults<br>
   to ON.<br>
<br>
+**SPHINX_WARNINGS_AS_ERRORS**:BOOL<br>
+  If enabled then sphinx documentation warnings will be treated as<br>
+  errors. Defaults to ON.<br>
+<br>
 Executing the test suite<br>
 ========================<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>