<div dir="ltr">Let me know when you re-commit this and I'll update libc++ to handle it.<div><br></div><div>/Eric</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, May 3, 2017 at 11:22 AM, Tom Stellard via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: tstellar<br>
Date: Wed May  3 12:22:23 2017<br>
New Revision: 302054<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=302054&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=302054&view=rev</a><br>
Log:<br>
Revert "CMake: Move sphinx detection into AddSphinxTarget.cmake"<br>
<br>
This reverts commit r302025.<br>
<br>
clang and lld need to be updated too so they don't break with this patch.<br>
<br>
Modified:<br>
    llvm/trunk/cmake/config-ix.<wbr>cmake<br>
    llvm/trunk/cmake/modules/<wbr>AddSphinxTarget.cmake<br>
    llvm/trunk/docs/CMakeLists.txt<br>
<br>
Modified: llvm/trunk/cmake/config-ix.<wbr>cmake<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=302054&r1=302053&r2=302054&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/cmake/<wbr>config-ix.cmake?rev=302054&r1=<wbr>302053&r2=302054&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/cmake/config-ix.<wbr>cmake (original)<br>
+++ llvm/trunk/cmake/config-ix.<wbr>cmake Wed May  3 12:22:23 2017<br>
@@ -530,6 +530,16 @@ else()<br>
   message(STATUS "Doxygen disabled.")<br>
 endif()<br>
<br>
+if (LLVM_ENABLE_SPHINX)<br>
+  message(STATUS "Sphinx enabled.")<br>
+  find_package(Sphinx REQUIRED)<br>
+  if (LLVM_BUILD_DOCS)<br>
+    add_custom_target(sphinx ALL)<br>
+  endif()<br>
+else()<br>
+  message(STATUS "Sphinx disabled.")<br>
+endif()<br>
+<br>
 set(LLVM_BINDINGS "")<br>
 if(WIN32)<br>
   message(STATUS "Go bindings disabled.")<br>
<br>
Modified: llvm/trunk/cmake/modules/<wbr>AddSphinxTarget.cmake<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddSphinxTarget.cmake?rev=302054&r1=302053&r2=302054&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/cmake/<wbr>modules/AddSphinxTarget.cmake?<wbr>rev=302054&r1=302053&r2=<wbr>302054&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/cmake/modules/<wbr>AddSphinxTarget.cmake (original)<br>
+++ llvm/trunk/cmake/modules/<wbr>AddSphinxTarget.cmake Wed May  3 12:22:23 2017<br>
@@ -1,16 +1,3 @@<br>
-<br>
-# Create sphinx target<br>
-if (LLVM_ENABLE_SPHINX AND NOT TARGET sphinx)<br>
-  message(STATUS "Sphinx enabled.")<br>
-  find_package(Sphinx REQUIRED)<br>
-  if (LLVM_BUILD_DOCS)<br>
-    add_custom_target(sphinx ALL)<br>
-  endif()<br>
-else()<br>
-  message(STATUS "Sphinx disabled.")<br>
-endif()<br>
-<br>
-<br>
 # Handy function for creating the different Sphinx targets.<br>
 #<br>
 # ``builder`` should be one of the supported builders used by<br>
<br>
Modified: llvm/trunk/docs/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CMakeLists.txt?rev=302054&r1=302053&r2=302054&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/docs/<wbr>CMakeLists.txt?rev=302054&r1=<wbr>302053&r2=302054&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/docs/CMakeLists.txt (original)<br>
+++ llvm/trunk/docs/CMakeLists.txt Wed May  3 12:22:23 2017<br>
@@ -103,8 +103,8 @@ endif()<br>
 endif()<br>
<br>
 if (LLVM_ENABLE_SPHINX)<br>
-  include(AddSphinxTarget)<br>
   if (SPHINX_FOUND)<br>
+    include(AddSphinxTarget)<br>
     if (${SPHINX_OUTPUT_HTML})<br>
       add_sphinx_target(html llvm)<br>
     endif()<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>